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

Conflicts:
	Controllers/FieldScreenController.js

	modified:   Controllers/FieldScreenController.js
	modified:   Controllers/Test.html
	modified:   GlobalSettings/GlobalSettings.js
	new file:   Models/Explosion.js
	modified:   Models/Field.js