woops (fix shared_ptr this in Player ctor)
Merge branch 'master' into Jimmy

Conflicts:
	grief/grief/map.txt