didn't really change anything... just added a comment
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project