inheritance
Merge remote-tracking branch 'origin/entities-ben' into entities-ben

Conflicts:
	GameExercise/board.cpp