Commit before merging
Merge branch 'master' of github.com:alvincai/crypto-eng-assn2
Added conclusion