Player was incorporated into an object
player is incorporated into an object
fixed the number fuck up
still not working
something that works
Updated AI to compile
Fixed EnemyShip.js merge conflicts
Better Ship to EnemyShip class structure
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/EnemyShip.js
Commented AI stuff
EnemyShip update
matts triangles
triangles merged
Rotation function on EnemyShip
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh
Shooting now works
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/PlayerShip.js
Made Ship control the movement, firing and death
collisions
collisions and ship