Scoring and Tastes implemented fully
Scoring works! But I don't know what happened with Ning's merge. I think this is kinda fixed?
-Josiah
Scoring and Tastes is actually working! Other stuff that isn't mine isn't working. Done for tonight.
Deleting stupid files
Merge branch 'Ning'
deleted some extra meta files
Merge branch 'Ning'
Updated Character control stuff and Tastes -Josiah
Adding taste and scoring etc work in. Many things are broken, but no more broken than before this commit, I don't think
Changed characterNums in preparation for Trash character
Removed a couple of useless variables
Fixed the formatting in Character.cs
Added Score Display
Reformated some of the code so the tabbing structure works
Commented more code
Merge branch 'master' of https://github.com/cs327/WordSnack

Conflicts:
	.gitignore
	GameAssets/Art/2D/README.txt
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Background/Background
Scripts/GameBackground.prefab.meta
	Unity Project/Assets/Background/SplashScreen2.png.meta
	Unity Project/Assets/Background/orange-background.png.meta
	Unity Project/Assets/Background/orange-background.png.meta~Ning
	Unity Project/Assets/Characters/GameObjects.meta~Ning_1
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~Ning
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~Stashed
changes
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~Updated
upstream
	Unity Project/Assets/Characters/GameObjects/Character4.prefab
	Unity Project/Assets/Characters/GameObjects/Character4.prefab~HEAD
	Unity Project/Assets/Characters/GameObjects/Character4.prefab~Ning
	Unity Project/Assets/Characters/GameObjects/Character5.prefab~Ning_0
	Unity Project/Assets/Characters/GameObjects/Character5.prefab~Updated
upstream
	Unity Project/Assets/Characters/GameObjects/CharacterAssets.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta~HEAD_1
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta~Ning
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta~Ning_0
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta~Ning_1
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta~Stashed changes
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta~Updated upstream
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Chompers_Eating.an
im.meta
	Unity Project/Assets/Characters/PlayerScripts/Character.cs
	Unity Project/Assets/GUI/App Icon/AppIcon2.png.meta
	Unity Project/Assets/GUI/Textures/button.png.meta
	Unity Project/Assets/GameController/GameController
Scripts/characterSelectController.cs
	Unity Project/Assets/GameController/GameController
Scripts/wordBuildingController.cs
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Atlas
- Masks.psd.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive
Atlas.mat.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive
Atlas.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Header.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Header.txt.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Normal.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Normal.txt.meta
	Unity Project/Assets/NGUI/Examples/Atlases/SciFi.meta
	Unity Project/Assets/NGUI/Examples/Atlases/SciFi/SciFi Font -
Header.txt.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Wooden.meta
	Unity Project/Assets/Scenes/CharacterSelect.unity
	Unity Project/Assets/Scenes/Test Scenes.meta
	Unity Project/Assets/Scenes/Test Scenes.meta~Ning
	Unity Project/Assets/Scenes/Test Scenes.meta~Ning_0
	Unity Project/Assets/Scenes/Test Scenes.meta~Stashed changes
	Unity Project/Assets/Scenes/WordMaking.unity
	Unity Project/Assets/WordList/sowpods.txt.meta
	Unity Project/Assets/WordList/sowpods.txt.meta~HEAD_1
	Unity Project/Assets/WordList/sowpods.txt.meta~Ning_2
	Unity Project/Assets/WordList/sowpods.txt.meta~Stashed changes
	Unity Project/Assets/WordList/sowpods.txt.meta~Updated upstream
	Unity Project/Assets/letterGenScript/LetterController.cs
	Unity Project/Assets/letterGenScript/letters/letterA.prefab
	Unity Project/Assets/letterGenScript/letters/letterB.prefab
	Unity Project/Assets/letterGenScript/letters/letterC.prefab
	Unity Project/Assets/letterGenScript/letters/letterD.prefab
	Unity Project/ProjectSettings/ProjectSettings.asset
	Unity Project/ProjectSettings/TagManager.asset
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs
deleted extra meta files
Merge branch 'master' into Ning
Moved min/max wordlength to variableControl, removed redundant variables from variableControl, and implemented inability to trash single letters
word list maker now uses tuning variables properly, also removed unused variables that are now in variableControl from letterController