.
Merge branch 'master' of https://github.com/Getshi/Barrels

Conflicts:
	Assets/Prefabs/Barrel.prefab
	Assets/Scene.unity