trying to fix
Merge branch 'master' of https://github.com/kingofraytown/BOAB

Conflicts:
	BoaB/Temp/UnityTempFile-3035d29f9fe414909a1ac88f18d6fb5e
	BoaB/Temp/__EditModeScene
got it working
Merge branch 'jjenkins'

Conflicts:
	BoaB/Temp/UnityTempFile-3035d29f9fe414909a1ac88f18d6fb5e
	BoaB/Temp/__EditModeScene