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
edited Character.cs
Updated the summary screen!
Updated the menu/start screen
moved two art files to a folder
Added the about button to the menu screen
Added the About Us scene
Merged awesome Programming team changes in