Add monsters back
Merge branch 'master' of https://github.com/cs327/WordSnack
Made a playeable game\!
Merge branch 'master' of https://github.com/cs327/WordSnack
Getting rid of a lot of trash and pushing my working, playable copy to master
Monster Animations
Merge branch 'master' of https://github.com/cs327/WordSnack

Conflicts:
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
Added metadata files that should fix the null instantiation problem
Added prefabs back in
Merge branch 'Ning'

Conflicts:
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs
resolved conflicts
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
Merge branch 'master' into Ning
cleaned up UI in the word making scene