Callum and Adel's changes on 12/02/19

Dependencies:   Crypto

main.cpp/shortlog/shortlog@4e88faab6988: not found in manifest