So many comments + more tests
Made one test a tad more robust
Merge branch 'master' of github.com:ericye16/ICS-Game-Project