modified:   Controllers/FieldScreenController.js
	modified:   GlobalSettings/GlobalSettings.js
	modified:   Levels/MakeLevelOne.js
	modified:   Models/Fightership.js
Merge github.com:sen-yang/Galaga_legit

Conflicts:
	Controllers/FieldScreenController.js
	Models/Fightership.js

	modified:   Controllers/FieldScreenController.js
	modified:   Controllers/FieldScreenController.js