fixed a merge conflict
Merge branch 'master' of https://github.com/cs327/WordSnack

Conflicts:
	Unity Project/Assets/Characters/PlayerScripts/Character.cs
	Unity Project/Unity Project.userprefs