Merge branch 'master' of https://github.com/Gizmo4Life/TAPP_Project2 into TeamA
Merge branch 'develop' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA
Merge branch 'teamB' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA
Merge branch 'develop' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA
Merge branch 'teamA' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA

Conflicts:
	.gitignore
.
Merge branch 'develop' of https://github.com/Gizmo4Life/TAPP_Project2 into teamA

Conflicts:
	.gitignore
Trivial AI implemented
Merge branch 'teamB' of https://github.com/Gizmo4Life/TAPP_Project2 into teamB
Added trivial AI
Added trivial AI
GraphicalImage implemented, demo should follow player.
Removed debug code from SlickSandbox, which caused the game to freeze after 2000 frames
Fixed a physics anomaly (bug?)
Updated the message in the demo; fixed its failure to detect a key-press
asteroids implemented!
directory cleanup
Framerate recapped.
cleaning house
clearing unwanted files