Merge branch 'master' of https://github.com/bonus2113/storyworld-jam

Conflicts:
	unity-wizarding/UnityVS.unity-wizarding.v12.suo
candle maybe
Merge branch 'master' of https://github.com/bonus2113/storyworld-jam