settings
Merge branch 'master' of https://github.com/zergx1/mario

Conflicts:
	source/mainGeneral.cpp