I guess I really enjoy tests.
Merge branch 'master' of github.com:ericye16/ICS-Game-Project
Merge branch 'master' of github.com:ericye16/ICS-Game-Project