Meh?
Merge branch 'master' of https://github.com/SpaceCowboy326/JustForFun

Conflicts:
	SFMLTest/Debug/SFMLTest.exe
	SFMLTest/Debug/SFMLTest.ilk
	SFMLTest/SFMLTest.sdf
	SFMLTest/SFMLTest/Battle.cpp
	SFMLTest/SFMLTest/Battle.h