dhf
Merge branch 'master' of https://github.com/SophiesGames/Sophies

Conflicts:
	.gitmodules