trying to get the latest build
Merge branch 'master' of https://github.com/cs327/WordSnack

Conflicts:
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs
Commit to Merge
Added to .gitignore
Merge branch 'master' of https://github.com/cs327/WordSnack
Added more to .gitignore
Trying to get .gitignore to work
Trying to fix .gitignore
Trying to fix .gitignore
gitignore sucks
Trying to fix .gitignore
Added Shuffling Mechanic
Merge branch 'master' of https://github.com/cs327/WordSnack

Conflicts:
	.gitignore
	Unity Project/Assembly-CSharp-Editor-vs.csproj
	Unity Project/Assembly-CSharp-Editor.csproj
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Scenes/StartScreen.unity
	Unity Project/Assets/letterGenScript/LetterController.cs
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln