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

Conflicts:
	ProjectSettings/ProjectSettings.asset
Merge branch 'master' of https://github.com/Getshi/Barrels
..
Merge branch 'master' of https://github.com/Getshi/Barrels
lasdlasdl
Merge branch 'master' of https://github.com/Getshi/Barrels