Merge branch 'master' of https://github.com/modestvillain/UniClone

Conflicts:
	Assets/JillsShizel.unity
	Assets/Scripts/General Scripts/HexTile.cs