modified:   Controllers/FieldScreenController.js
	modified:   Controllers/FieldScreenController.js
Merge github.com:sen-yang/Galaga_legit

Conflicts:
	Controllers/FieldScreenController.js
	modified:   Controllers/FieldScreenController.js
Merge github.com:sen-yang/Galaga_legit
	modified:   Controllers/FieldScreenController.js
	modified:   GlobalSettings/GlobalSettings.js
	new file:   Levels/MakeLevelN.js
	modified:   Levels/MakeLevelOne.js
	modified:   Models/EnemyArmy.js
	modified:   Models/EnemyFightership.js
	modified:   Models/Fightership.js
	modified:   Models/Rules.js
	modified:   Models/Schedule.js
Merge github.com:sen-yang/Galaga_legit