asdf
Merge branch 'master' of https://github.com/jah6842/WinDir3D

Conflicts:
	Debug/Final.exe
	Final/Debug/vc110.idb
	Final/Main.cpp