merging fun
Merge branch 'master' of https://github.com/picoriley/Halma-Game-UI

Conflicts:
	Unity Project/Assembly-CSharp-Editor-vs.csproj
	Unity Project/Assembly-CSharp-Editor.csproj
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln