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

Dependencies:   Crypto

main.cpp/shortlog@995865498aee: not found in manifest