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

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

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