Code cleanup.
Merge branch 'master' of https://github.com/hydrais/shot

Conflicts:
	Shot/obj/Debug/Shot.csproj.FileListAbsolute.txt