new file:   Logo.bmp
	new file:   Makefile
	new file:   MapViewer/MapLoader.cpp
	new file:   MapViewer/MapLoader.h
	new file:   MapViewer/MapViewer.cbp
	new file:   MapViewer/MapViewer.depend
	new file:   MapViewer/MapViewer.exe
	new file:   MapViewer/MapViewer.layout
	new file:   MapViewer/SDL.dll
	new file:   MapViewer/SDL_image.dll
	new file:   MapViewer/TMXLoader.cpp
	new file:   MapViewer/TMXLoader.h
	new file:   MapViewer/TMXLoader.o
	new file:   MapViewer/Timer.cpp
	new file:   MapViewer/Timer.h
	new file:   MapViewer/base64.cpp
	new file:   MapViewer/base64.h
	new file:   MapViewer/bin/Debug/MapViewer.exe
	new file:   MapViewer/bin/Debug/debug.txt
	new file:   MapViewer/blocks1.png
	new file:   MapViewer/debug.txt
	new file:   MapViewer/libpng12-0.dll
	new file:   MapViewer/main.cpp
	new file:   MapViewer/obj/Debug/MapLoader.o
	new file:   MapViewer/obj/Debug/TMXLoader.o
	new file:   MapViewer/obj/Debug/Timer.o
	new file:   MapViewer/obj/Debug/base64.o
	new file:   MapViewer/obj/Debug/main.o
	new file:   MapViewer/obj/Debug/tinyxml/tinystr.o
	new file:   MapViewer/obj/Debug/tinyxml/tinyxml.o
	new file:   MapViewer/obj/Debug/tinyxml/tinyxmlerror.o
	new file:   MapViewer/obj/Debug/tinyxml/tinyxmlparser.o
	new file:   MapViewer/testa.tmx
	new file:   MapViewer/tinyxml/Makefile
	new file:   MapViewer/tinyxml/changes.txt
	new file:   MapViewer/tinyxml/readme.txt
	new file:   MapViewer/tinyxml/tinystr.cpp
	new file:   MapViewer/tinyxml/tinystr.h
	new file:   MapViewer/tinyxml/tinystr.o
	new file:   MapViewer/tinyxml/tinyxml.cpp
	new file:   MapViewer/tinyxml/tinyxml.h
	new file:   MapViewer/tinyxml/tinyxml.o
	new file:   MapViewer/tinyxml/tinyxmlerror.cpp
	new file:   MapViewer/tinyxml/tinyxmlerror.o
	new file:   MapViewer/tinyxml/tinyxmlparser.cpp
	new file:   MapViewer/tinyxml/tinyxmlparser.o
	new file:   MapViewer/tinyxml/xmltest.cpp
	new file:   MapViewer/zlib1.dll
	new file:   RevoPop.ttf
	new file:   map.tmx
	new file:   src/.DataTypes.cpp.swp
	new file:   src/.DataTypes.h.swp
	new file:   src/AIController.cpp
	new file:   src/AIController.h
	new file:   src/AnimatedSprite.cpp
	new file:   src/AnimatedSprite.hpp
	new file:   src/Animation.cpp
	new file:   src/Animation.hpp
	new file:   src/Camera.cpp
	new file:   src/Camera.h
	new file:   src/Character.cpp
	new file:   src/Character.h
	new file:   src/DataTypes.cpp
	new file:   src/DataTypes.h
	new file:   src/Engine.cpp
	new file:   src/Engine.h
	new file:   src/GInitState.cpp
	new file:   src/GInitState.h
	new file:   src/GMenuState.cpp
	new file:   src/GMenuState.h
	new file:   src/GPlayState.cpp
	new file:   src/GPlayState.h
	new file:   src/GameState.h
	new file:   src/InputManager.cpp
	new file:   src/InputManager.h
	new file:   src/Terrain.cpp
	new file:   src/Terrain.h
	new file:   src/main.cpp
	new file:   zombie.png
	deleted:    Logo.bmp
	modified:   Makefile
	deleted:    MapViewer/MapLoader.cpp
	deleted:    MapViewer/MapLoader.h
	deleted:    MapViewer/MapViewer.cbp
	deleted:    MapViewer/MapViewer.depend
	deleted:    MapViewer/MapViewer.exe
	deleted:    MapViewer/MapViewer.layout
	deleted:    MapViewer/SDL.dll
	deleted:    MapViewer/SDL_image.dll
	deleted:    MapViewer/TMXLoader.cpp
	deleted:    MapViewer/TMXLoader.h
	deleted:    MapViewer/TMXLoader.o
	deleted:    MapViewer/Timer.cpp
	deleted:    MapViewer/Timer.h
	deleted:    MapViewer/base64.cpp
	deleted:    MapViewer/base64.h
	deleted:    MapViewer/bin/Debug/MapViewer.exe
	deleted:    MapViewer/bin/Debug/debug.txt
	deleted:    MapViewer/blocks1.png
	deleted:    MapViewer/debug.txt
	deleted:    MapViewer/libpng12-0.dll
	deleted:    MapViewer/main.cpp
	deleted:    MapViewer/obj/Debug/MapLoader.o
	deleted:    MapViewer/obj/Debug/TMXLoader.o
	deleted:    MapViewer/obj/Debug/Timer.o
	deleted:    MapViewer/obj/Debug/base64.o
	deleted:    MapViewer/obj/Debug/main.o
	deleted:    MapViewer/obj/Debug/tinyxml/tinystr.o
	deleted:    MapViewer/obj/Debug/tinyxml/tinyxml.o
	deleted:    MapViewer/obj/Debug/tinyxml/tinyxmlerror.o
	deleted:    MapViewer/obj/Debug/tinyxml/tinyxmlparser.o
	deleted:    MapViewer/testa.tmx
	deleted:    MapViewer/tinyxml/Makefile
	deleted:    MapViewer/tinyxml/changes.txt
	deleted:    MapViewer/tinyxml/readme.txt
	deleted:    MapViewer/tinyxml/tinystr.cpp
	deleted:    MapViewer/tinyxml/tinystr.h
	deleted:    MapViewer/tinyxml/tinystr.o
	deleted:    MapViewer/tinyxml/tinyxml.cpp
	deleted:    MapViewer/tinyxml/tinyxml.h
	deleted:    MapViewer/tinyxml/tinyxml.o
	deleted:    MapViewer/tinyxml/tinyxmlerror.cpp
	deleted:    MapViewer/tinyxml/tinyxmlerror.o
	deleted:    MapViewer/tinyxml/tinyxmlparser.cpp
	deleted:    MapViewer/tinyxml/tinyxmlparser.o
	deleted:    MapViewer/tinyxml/xmltest.cpp
	deleted:    MapViewer/zlib1.dll
	deleted:    RevoPop.ttf
	deleted:    map.tmx
	deleted:    src/.DataTypes.cpp.swp
	deleted:    src/.DataTypes.h.swp
	modified:   src/AnimatedSprite.cpp
	modified:   src/AnimatedSprite.hpp
	new file:   src/Arena.cpp
	new file:   src/Arena.h
	new file:   src/Bullet.cpp
	new file:   src/Bullet.h
	deleted:    src/Camera.cpp
	deleted:    src/Camera.h
	modified:   src/Character.cpp
	modified:   src/Character.h
	deleted:    src/DataTypes.cpp
	deleted:    src/DataTypes.h
	modified:   src/Engine.cpp
	new file:   src/Fighter.cpp
	new file:   src/Fighter.h
	new file:   src/GCharacterSelectState.cpp
	new file:   src/GCharacterSelectState.h
	deleted:    src/GInitState.cpp
	deleted:    src/GInitState.h
	modified:   src/GMenuState.cpp
	modified:   src/GMenuState.h
	modified:   src/GPlayState.cpp
	modified:   src/GPlayState.h
	new file:   src/HUD.cpp
	new file:   src/HUD.h
	modified:   src/InputManager.cpp
	modified:   src/InputManager.h
	new file:   src/Ninja.cpp
	new file:   src/Ninja.h
	new file:   src/Shooter.cpp
	new file:   src/Shooter.h
	deleted:    src/Terrain.cpp
	deleted:    src/Terrain.h
	modified:   src/main.cpp
	deleted:    zombie.png
	new file:   rec/RevoPop.ttf
	new file:   rec/elektro.png
	new file:   rec/fighter.png
	new file:   rec/laserball.png
	new file:   rec/map.png
	new file:   rec/markers.png
	new file:   rec/selectBG.png
	new file:   rec/shock.png
	new file:   rec/title.png
	new file:   rec/ultralaser.png
Merge branch 'master' of https://github.com/Chase-C/Ten-Seconds-to-Death