"added some things fixed some things"
Merge branch 'master' of github.com:Flygoniq/Per10-Guo-Jiang-PioneerTD
"fixing conflicts"
Conflicts:
	main/Grid.pde
"committing to pull"
Merge branch 'master' of github.com:Flygoniq/Per10-Guo-Jiang-PioneerTD
"fixing conflicts"
Conflicts:
	main/Grid.pde
	main/Ship.pde
"firing is good"