John's Edit
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project