Merge pull request #8 from Crysco/master

merge team stuff
test changes
Merge pull request #9 from Crysco/Crys'-Branch

Crys' branch
Merge remote-tracking branch 'origin/Working-Branch'
b
Merge remote-tracking branch 'origin/Working-Branch'
prodaccel change test
Merge pull request #10 from Crysco/Crys'-Branch

Changed productionAccel
Merge pull request #8 from Crysco/Crys'-Branch

Crys' branch
empty
Merge pull request #11 from Crysco/master

Testing. Testing
clean up test
Merge pull request #9 from Crysco/Crys'-Branch

Ship Logic
clean test again
clean
Collision Detection
Collision Detection2
Merge pull request #10 from mko237/master

Collision Detection