Git ignore
Merge branch 'master' of https://github.com/Jidehem1993/SmashTheButton

Conflicts:
	bin/Smash.swf
	obj/SmashConfig.old
	obj/SmashConfig.xml