Stencyl Auto changes
Merge branch 'master' of https://github.com/jokigenki/Foxtrot

Conflicts:
	game.xml
	game.xml.bak
	scenes/20.xml