M3, changes recorded in readme
Merge branch 'master' of https://github.com/tyrioey/cs2340-team7