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

Dependencies:   Crypto

main.cpp/shortlog/shortlog@de4320f74764: not found in manifest