hello it is nice to commit things when I edit them

ugh
Merge branch 'master' of github.com:hmaon/exploration

Conflicts:
	dxgame/LuaSharedPointerActorWrapper.h