Added collision resolution (maybe)
Merge branch 'master' of https://github.com/phishycake/ChairGame