- palapapush
Merge branch 'master' of https://github.com/Janisse/SandyKillOSG

Conflicts:
	SandyKillOSG/SandyKillOSG.vcxproj
	SandyKillOSG/SandyKillOSG.vcxproj.filters