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

Dependencies:   Crypto

main.cpp/shortlog/shortlog@805c87360b55: not found in manifest