Commit before updating. Negligible changes?
Merge branch 'master' of https://github.com/jokigenki/Foxtrot

Conflicts:
	game.xml
	game.xml.bak
	resources/data.xml