Fixed steps in Factory 10.
Added Laser to Factory 11.
Merge branch 'master' of https://github.com/jokigenki/Foxtrot

# By Tim Frost
# Via Tim Frost
* 'master' of https://github.com/jokigenki/Foxtrot:
  Farm 1_2 updated

Conflicts:
	scenes/7.xml