created Player and Enemy with Entity properties
Merge remote-tracking branch 'origin/master' into asko

Conflicts:
	solution/Ludum Dare 30/Ludum Dare 30.vcxproj.filters
Merge remote-tracking branch 'origin/master' into asko
Updated entity class, started to create playState.

player also have keyboard controls now and it is created in playstate.
Merge branch 'master' into asko
Fixed merge
Merge branch 'asko'