score

This is a start on the score
Merge remote-tracking branch 'origin/master'

Conflicts:
	Warmyparmy/Warmyparmy-csharp.sln
	Warmyparmy/Warmyparmy.sln
	Warmyparmy/Warmyparmy.userprefs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Warmyparmy/Warmyparmy-csharp.sln
	Warmyparmy/Warmyparmy.sln
	Warmyparmy/Warmyparmy.userprefs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Warmyparmy/Assets/Scenes/TestChanisco.unity
	Warmyparmy/Warmyparmy-csharp.sln
	Warmyparmy/Warmyparmy.sln
	Warmyparmy/Warmyparmy.userprefs