Cleanup and commenting
Merge branch 'master' of https://github.com/bisen/cs123FinalProject