dammit
Merge branch 'master' of https://github.com/vblanco20-1/2dCraft

Conflicts:
	2dCraft.vcxproj