Somehow managed to get merge conflicts with myself :/

Conflicts:
	Makefile
	src/animation.cpp
	src/collision.cpp
	src/collision.h
	src/game.cpp
	src/gameobject.cpp
	src/gameobject.h
	src/ids.h
	src/objectmanager.cpp
	src/objectmanager.h
	src/render.cpp
	src/resourcemanager.cpp
	src/sprite.cpp
	src/sprite.h
Messed up makefile merge, now fixed
Conflicts:
	Makefile