modified boss
Merge branch 'master' of https://github.com/fablman/austrian-game-jam-2014

Conflicts:
	Assets/Sounds/star_wars_cropped.wav.meta