stuff happened at this point
Merge branch 'master' of https://github.com/AllodialAxolotlAggregate/arcaneaxis

Conflicts:
	DirectX11 AA2/Debug/DirectX11_Starter.exe
	DirectX11 AA2/Debug/DirectX11_Starter.ilk
	DirectX11 AA2/Debug/DirectX11_Starter.pdb
	DirectX11 AA2/Debug/FontPixelShader.cso
	DirectX11 AA2/Debug/FontVertexShader.cso
	DirectX11 AA2/Debug/PixelShader.cso
	DirectX11 AA2/Debug/TexturePixelShader.cso
	DirectX11 AA2/Debug/TextureVertexShader.cso
	DirectX11 AA2/Debug/VertexShader.cso
	DirectX11 AA2/DirectX11_Starter.sdf
	DirectX11 AA2/DirectX11_Starter.v11.suo
	DirectX11 AA2/DirectX11_Starter/Debug/Artifact.obj
	DirectX11 AA2/DirectX11_Starter/Debug/CL.read.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/CL.write.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/Camera.obj
	DirectX11 AA2/DirectX11_Starter/Debug/DXGame.obj
	DirectX11 AA2/DirectX11_Starter/Debug/DemoGame.obj
	DirectX11 AA2/DirectX11_Starter/Debug/DirectX11_Starter.lastbuildstate
	DirectX11 AA2/DirectX11_Starter/Debug/DirectX11_Starter.log
	DirectX11 AA2/DirectX11_Starter/Debug/DirectX11_Starter.vcxprojResolveAssemblyReference.cache
	DirectX11 AA2/DirectX11_Starter/Debug/DirectX11_Starter.write.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/FXC.command.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/FXC.write.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/Font.obj
	DirectX11 AA2/DirectX11_Starter/Debug/FontShader.obj
	DirectX11 AA2/DirectX11_Starter/Debug/GameEntity.obj
	DirectX11 AA2/DirectX11_Starter/Debug/GameTimer.obj
	DirectX11 AA2/DirectX11_Starter/Debug/Material.obj
	DirectX11 AA2/DirectX11_Starter/Debug/Mesh.obj
	DirectX11 AA2/DirectX11_Starter/Debug/Rune.obj
	DirectX11 AA2/DirectX11_Starter/Debug/Sentence.obj
	DirectX11 AA2/DirectX11_Starter/Debug/Spellbook.obj
	DirectX11 AA2/DirectX11_Starter/Debug/Text.obj
	DirectX11 AA2/DirectX11_Starter/Debug/Tile.obj
	DirectX11 AA2/DirectX11_Starter/Debug/TileMap.obj
	DirectX11 AA2/DirectX11_Starter/Debug/cl.command.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/dxerr.obj
	DirectX11 AA2/DirectX11_Starter/Debug/fxc.read.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/link.command.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/link.read.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/link.write.1.tlog
	DirectX11 AA2/DirectX11_Starter/Debug/vc110.idb
	DirectX11 AA2/DirectX11_Starter/Debug/vc110.pdb
	DirectX11 AA2/DirectX11_Starter/DemoGame.cpp
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/AlphaTestEffect.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/BasicEffect.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/BinaryReader.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/CL.read.1.tlog
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/CL.write.1.tlog
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/CommonStates.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DDSTextureLoader.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DGSLEffect.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DGSLEffectFactory.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DirectXTK.idb
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DirectXTK.lib
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DirectXTK.pch
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DirectXTK_Desktop_2012.lastbuildstate
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DirectXTK_Desktop_2012.log
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/DualTextureEffect.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/EffectCommon.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/EffectFactory.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/EnvironmentMapEffect.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/GeometricPrimitive.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/Lib-link.read.1.tlog
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/Lib-link.write.1.tlog
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/Model.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/ModelLoadCMO.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/ModelLoadSDKMESH.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/PrimitiveBatch.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/ScreenGrab.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/SkinnedEffect.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/SpriteBatch.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/SpriteFont.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/VertexTypes.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/WICTextureLoader.obj
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/cl.command.1.tlog
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/directxtk.pdb
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/lib.command.1.tlog
	DirectX11 AA2/DirectX11_Starter/DirectXTK/Bin/Desktop_2012/Win32/Debug/pch.obj