Merge branch 'master' of https://github.com/philipcass/gamecraft5

Conflicts:
	Assets/Materials/Particle.mat
	Assets/Prefabs/Voter.prefab
	Assets/Scenes/main.unity
	Assets/Scripts/UIController.cs
	Assets/Sprites/ManaBar.png.meta