Updated comments to include @author tag
Merge branch 'master' of https://github.com/CMPUT301F12T07/classproject.git