added shuffle and end game placeholder buttons
Merge branch 'Ning'

Conflicts:
	Unity Project/Assets/GameController/GameController
Scripts/wordBuildingController.cs
	Unity Project/Assets/Scenes/WordMaking.unity
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs