modified:   SuitEmUp_Basev2/thelastbox.v11.suo
Merge branch 'master' of https://github.com/GroupEight/SuitEmUp_

Conflicts:
	SuitEmUp_Basev2/thelastbox.v11.suo

	modified:   .gitignore
	modified:   SuitEmUp_Basev2/thelastbox/CollisionMan.cpp
	new file:   SuitEmUp_Basev2/thelastbox/EnemyBullet.cpp
	new file:   SuitEmUp_Basev2/thelastbox/EnemyBullet.h
	modified:   SuitEmUp_Basev2/thelastbox/EnemyObject.cpp
	modified:   SuitEmUp_Basev2/thelastbox/EnemyObject.hpp
	new file:   SuitEmUp_Basev2/thelastbox/NodeMan.cpp
	new file:   SuitEmUp_Basev2/thelastbox/NodeMan.h
	modified:   SuitEmUp_Basev2/thelastbox/SceneNode.cpp
	modified:   SuitEmUp_Basev2/thelastbox/SceneNode.hpp