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

Dependencies:   Crypto

main.cpp/shortlog/shortlog@08f338b5e4d9: not found in manifest