Object is Baseclass
Merge remote-tracking branch 'origin/master'

Conflicts:
	2DGame/enemy.cpp
	2DGame/object.h
	2DGame/player.cpp