BG Factory 2_2 updated
Farm Tile set added
Merge branch 'master' of https://github.com/jokigenki/Foxtrot

Conflicts:
	game.xml
	game.xml.bak