Boss tweaks
Merge branch 'master' of https://github.com/dvera2/ggj2014

Conflicts:
	Assets/Scripts/Boss.cs