adding in condition logic
Merge branch 'master' of github.com:awalterman/survival

Conflicts:
	SurvivalPrototype/Assets/Scenes/PlayerInTestMap.unity
Merge branch 'master' of github.com:awalterman/survival