Added collision detection data and skeleton.  To DO; Write bounding boxes, do mesh to mesh collision check, add rigid body physics
VS merging
VS merging
Collision files
merge conflicts
Merge branch 'master' of github.com:austinhulse/SpaceGame

Conflicts:
	SpaceGame/GameDebugOutput.txt
Merge branch 'jon_unstable'

Conflicts:
	SpaceGame/GameDebugOutput.txt
Fixed some bugs involving the MetaballEnemy class, added files with the MetalineEnemy and MetaplaneEnemy classes, and added a temporary Projectile class.
Fixed some bugs involving the MetaballEnemy class, added files with the MetalineEnemy and MetaplaneEnemy classes, and added a temporary Projectile class.
Fixed some issues with the MetaballEnemy, MetalineEnemy, and MetaplaneEnemy classes.
fixed linux compiler errors still trying to fix segfault