Entity
Merge branch 'master' of https://github.com/JokHornsby/Game-Engine

Conflicts:
	Game Engine/entity.cpp
	Game Engine/game.cpp
Collisions