collisions
haha
Merge branch 'master' of https://github.com/razorsharps/RPG

Conflicts:
	src/headers/GameObject.h
	src/sources/Game.cpp
	src/sources/GameObject.cpp