player
Small
Player/Map
CollisionTesting
getMove now works
introduced Editor class
Serialize/Deserialize
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
Git-fix
Merge pull request #7 from adeadrat/Sebastian

Sebastian