Tweaking the sword
Merge branch 'master' of github.com:jharger/ggj14
Merge branch 'master' of github.com:jharger/ggj14

Conflicts:
	Assets/Scenes/Level1.unity
Merged the player into one prefab