Removed some comments and added others
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project