Reverted and changed comment
Merge branch 'master' of https://github.com/ngavin/370Project1.git