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

Conflicts:
	.idea/workspace.xml

	modified:   Controllers/FieldScreenController.js
	modified:   Models/Player.js
	modified:   Models/Rules.js
	deleted:    Controllers/testgraphic.js