syncing commit
Merge branch 'master' of https://github.com/JamesZinger/HumberCollegeGAMEWinter2014