Just Stencyl moving stuff around for no reason.
Merge branch 'master' of https://github.com/jokigenki/Foxtrot

# By Tim Frost
# Via Tim Frost
* 'master' of https://github.com/jokigenki/Foxtrot:
  BG Factory 1_2 updated BG Factory 2_4 added Pipe tile set updated

Conflicts:
	game.xml
	game.xml.bak