test
Merge branch 'master' of https://github.com/Xendz/Wulfcore

Conflicts:
	Assets/BootCampScene.unity