added animation module
Merge branch 'master' of https://github.com/austinhulse/SpaceGame

Conflicts:
	Debug/SpaceGame.ilk
	Debug/SpaceGame.pdb
	Release/SpaceGame.pdb
	SpaceGame.sdf
	SpaceGame.v11.suo
	SpaceGame/Debug/CL.read.1.tlog
	SpaceGame/Debug/CL.write.1.tlog
	SpaceGame/Debug/SpaceGame.log
	SpaceGame/Debug/cl.command.1.tlog
	SpaceGame/Debug/link.command.1.tlog
	SpaceGame/Debug/link.read.1.tlog
	SpaceGame/Debug/link.write.1.tlog
	SpaceGame/Debug/main.obj
	SpaceGame/Debug/vc110.idb
	SpaceGame/Debug/vc110.pdb
	SpaceGame/GameDebugOutput.txt
	SpaceGame/GameRoom.cpp
	SpaceGame/GameState.cpp
	SpaceGame/Release/CL.read.1.tlog
	SpaceGame/Release/CL.write.1.tlog
	SpaceGame/Release/GameRoom.obj
	SpaceGame/Release/SpaceGame.lastbuildstate
	SpaceGame/Release/SpaceGame.log
	SpaceGame/Release/cl.command.1.tlog
	SpaceGame/Release/link.command.1.tlog
	SpaceGame/Release/link.read.1.tlog
	SpaceGame/Release/link.write.1.tlog
	SpaceGame/Release/main.obj
	SpaceGame/Release/vc110.pdb
	SpaceGame/Render.cpp
	SpaceGame/SpaceGame.vcxproj.filters
integrated animation into gamestate and render
Merge branch 'master' of https://github.com/austinhulse/SpaceGame

Conflicts:
	Debug/SpaceGame.ilk
	Debug/SpaceGame.pdb
	Release/SpaceGame.pdb
	SpaceGame.sdf
	SpaceGame.v11.suo
	SpaceGame/Debug/CL.read.1.tlog
	SpaceGame/Debug/CL.write.1.tlog
	SpaceGame/Debug/Camera.obj
	SpaceGame/Debug/CollisionDetection.obj
	SpaceGame/Debug/Controller.obj
	SpaceGame/Debug/EnemyProjectile.obj
	SpaceGame/Debug/GameActiveObject.obj
	SpaceGame/Debug/GameDebug.obj
	SpaceGame/Debug/GameDoor.obj
	SpaceGame/Debug/GameEventObject.obj
	SpaceGame/Debug/GamePlayer.obj
	SpaceGame/Debug/GameRoom.obj
	SpaceGame/Debug/GameState.obj
	SpaceGame/Debug/Mesh.obj
	SpaceGame/Debug/MetaballEnemy.obj
	SpaceGame/Debug/MetalineEnemy.obj
	SpaceGame/Debug/MetaplaneEnemy.obj
	SpaceGame/Debug/Monitor.obj
	SpaceGame/Debug/Render.obj
	SpaceGame/Debug/RoomBuilder.obj
	SpaceGame/Debug/Sound.obj
	SpaceGame/Debug/SpaceGame.log
	SpaceGame/Debug/TaskQueue.obj
	SpaceGame/Debug/UI.obj
	SpaceGame/Debug/bloom_utils.obj
	SpaceGame/Debug/cl.command.1.tlog
	SpaceGame/Debug/link.command.1.tlog
	SpaceGame/Debug/link.read.1.tlog
	SpaceGame/Debug/main.obj
	SpaceGame/Debug/projectile_particles.obj
	SpaceGame/Debug/shader_utils.obj
	SpaceGame/Debug/vc110.idb
	SpaceGame/Debug/vc110.pdb
	SpaceGame/GameData/Rooms/debug.room
	SpaceGame/GameDebugOutput.txt
	SpaceGame/GameObject.h
	SpaceGame/GameState.cpp
	SpaceGame/Release/CL.read.1.tlog
	SpaceGame/Release/CL.write.1.tlog
	SpaceGame/Release/Camera.obj
	SpaceGame/Release/CollisionDetection.obj
	SpaceGame/Release/Controller.obj
	SpaceGame/Release/EnemyProjectile.obj
	SpaceGame/Release/GameActiveObject.obj
	SpaceGame/Release/GameDebug.obj
	SpaceGame/Release/GameDoor.obj
	SpaceGame/Release/GameEventObject.obj
	SpaceGame/Release/GamePlayer.obj
	SpaceGame/Release/GameRoom.obj
	SpaceGame/Release/GameState.obj
	SpaceGame/Release/Mesh.obj
	SpaceGame/Release/MetaballEnemy.obj
	SpaceGame/Release/MetalineEnemy.obj
	SpaceGame/Release/MetaplaneEnemy.obj
	SpaceGame/Release/Monitor.obj
	SpaceGame/Release/Render.obj
	SpaceGame/Release/RoomBuilder.obj
	SpaceGame/Release/Sound.obj
	SpaceGame/Release/SpaceGame.log
	SpaceGame/Release/TaskQueue.obj
	SpaceGame/Release/UI.obj
	SpaceGame/Release/bloom_utils.obj
	SpaceGame/Release/cl.command.1.tlog
	SpaceGame/Release/link.command.1.tlog
	SpaceGame/Release/main.obj
	SpaceGame/Release/projectile_particles.obj
	SpaceGame/Release/shader_utils.obj
	SpaceGame/Release/vc110.pdb
	SpaceGame/Render.cpp

added working animation