Changing to SourceTree
Merge branch 'Dev'

Conflicts:
	AIE Template.sdf
	AIE Template.v12.suo
	bin/AIE Template_d.exe
	bin/AIE Template_d.pdb
	obj/AIE Template.log
	obj/AIE Template.tlog/CL.read.1.tlog
	obj/AIE Template.tlog/CL.write.1.tlog
	obj/Bullet.obj
	obj/Enemy.obj
	obj/KeyStater.obj
	obj/MyMaths.obj
	obj/Object.obj
	obj/Ship.obj
	obj/main.obj
	obj/vc120.idb
	obj/vc120.pdb
Major Update

Added Enemy
-Spawning
-Scrolling
-Resetting
-Active/Inactive
-Collision

Added SLaser
-Spawning
-Firing
-Collision
-Active/Inactive
Fixing some stuff

Just reworked bullets a little bit.
Finished project
Complete

NEEDS BETTER COMMENTS
Comments Complete
readme.txt added