reset
c
Merge branch 'master' of https://github.com/damp/Damp

Conflicts:
	SuperIHABrothers/SuperIHABrothers/SuperIHABrothers/GameMain.cs