Merge pull request #5 from adeadrat/Sebastian

Sebastian
Merge pull request #6 from adeadrat/Sebastian

getMove
player
Small
Player/Map
CollisionTesting
getMove now works
introduced Editor class
Merge remote-tracking branch 'origin/master' into Sebastian

Conflicts:
	grief/grief/Editor.cpp
	grief/grief/Map.cpp
	grief/grief/Map.h
	grief/grief/main.cpp