trying to get the latest build
trying to sync
The scoring scaffold now works... now just have to hook it into global
improved the UI for character selection screen

Conflicts:
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Scenes/ScoreScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity.meta
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs
Merge branch 'Ning'

Conflicts:
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Scenes/ScoreScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity.meta
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs
Merge branch 'master' of https://github.com/cs327/WordSnack
Merge branch 'isaiahWork'

Conflicts:
	Unity Project/Assets/Scenes/CharacterSelect.unity
	Unity Project/Assets/Scenes/WordMaking.unity
	Unity Project/ProjectSettings/TagManager.asset
trying to merge
Merge branch 'Ning'

Conflicts:
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Scenes/ScoreScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity.meta
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs
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
Merge branch 'Ning'

Conflicts:
	GameAssets/Art/2D/README.txt
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Background/Background
Scripts/SplashBackground.prefab
	Unity
Project/Assets/Background/Materials/playScreenBackground1.mat.meta
	Unity Project/Assets/Background/SplashScreen2.png.meta
	Unity Project/Assets/Background/orange-background.png.meta
	Unity Project/Assets/Characters/GameObjects.meta
	Unity Project/Assets/Characters/GameObjects/Character1.prefab.meta
	Unity Project/Assets/Characters/GameObjects/Character2.prefab.meta
	Unity Project/Assets/Characters/GameObjects/Character3.prefab
	Unity Project/Assets/Characters/GameObjects/Character4.prefab.meta
	Unity Project/Assets/Characters/GameObjects/Character5.prefab.meta
	Unity Project/Assets/Characters/GameObjects/CharacterAssets.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character1.control
ler.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta
	Unity Project/Assets/Characters/PlayerScripts/Character.cs
	Unity Project/Assets/Characters/SpriteSheets.meta
	Unity Project/Assets/GUI/App Icon/AppIcon2.png.meta
	Unity Project/Assets/GUI/GUI Scripts/CharacterSelectUI.cs.meta
	Unity Project/Assets/GUI/Textures/button.png.meta
	Unity Project/Assets/GameController/GameController
Scripts/characterSelectController.cs
	Unity Project/Assets/GameController/GameController
Scripts/startScreenController.cs.meta
	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
- Normal.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/SciFi.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/WordMaking.unity
	Unity Project/Assets/WordList.meta
	Unity Project/Assets/letterGenScript/LetterController.cs
	Unity Project/Assets/letterGenScript/debugLetters.cs.meta
	Unity Project/Assets/letterGenScript/letters/letterB.prefab
	Unity Project/Assets/letterGenScript/letters/letterD.prefab
	Unity Project/Assets/letters 2.meta
	Unity Project/Assets/letters/letterObj.prefab.meta
	Unity Project/ProjectSettings/ProjectSettings.asset
	Unity Project/ProjectSettings/TagManager.asset
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
try to merge with Ning
trying to merge with Ning
Scoring and Tastes is actually working! Other stuff that isn't mine isn't working. Done for tonight.
Deleting stupid files
improved character selection scene

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/Materials/playScreenBackground1.mat.meta~HEAD
	Unity Project/Assets/Background/SplashScreen2.png.meta
	Unity Project/Assets/Background/orange-background.png.meta
	Unity Project/Assets/Background/orange-background.png.meta~HEAD_0
	Unity Project/Assets/Characters/GameObjects.meta~HEAD_0
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~HEAD_0
	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.meta~Ning_0
	Unity Project/Assets/Characters/GameObjects/Character4.prefab~HEAD
	Unity Project/Assets/Characters/GameObjects/Character5.prefab.meta~HEAD
	Unity Project/Assets/Characters/GameObjects/Character5.prefab~HEAD
	Unity Project/Assets/Characters/GameObjects/Character5.prefab~Updated
upstream
	Unity Project/Assets/Characters/GameObjects/CharacterAssets.meta
	Unity Project/Assets/Characters/GameObjects/CharacterAssets.meta~HEAD_1
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character1.control
ler.meta~Ning
	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/Characters/PlayerScripts/Tastes.cs.meta
	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/GameController/GameController
Scripts/wordBuildingController.cs.meta
	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~Stashed changes
	Unity Project/Assets/Scenes/WordMaking.unity
	Unity Project/Assets/WordList/sowpods.txt.meta
	Unity Project/Assets/WordList/sowpods.txt.meta~HEAD
	Unity Project/Assets/WordList/sowpods.txt.meta~HEAD_0
	Unity Project/Assets/WordList/sowpods.txt.meta~HEAD_1
	Unity Project/Assets/WordList/sowpods.txt.meta~Ning_1
	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/debugLetters.cs.meta
	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/Assets/letters 2.meta
	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
Merge branch 'Ning'
deleted some extra meta files
deleted extra files