bug fixes with weapon, still in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	GBJAM/Assets/Scenes/Level1.unity
Revert "bug fixes with weapon, still in progress"

This reverts commit f19ae9685ee1016a397703e6d55488f541b74898.