small changes
Merge branch 'master' of github.com:coastwise/ggj2014

Bug fix

Conflicts:
	Assets/Scenes/level_01.unity