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

Conflicts:
	SFMLTest/SFMLTest.sdf
	SFMLTest/SFMLTest.v11.suo