one player script
Merge branch 'master' of https://github.com/josephto/TakeOutTheTrash

Conflicts:
	Assets/GamePlay.unity
	Assets/Round2.unity
	Assets/Round3.unity
	Assets/Scripts/Player.cs
	Assets/Scripts/PlayerGirl.cs
	Assets/Scripts/ScoreUIGirl.cs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/b9/b95d4ae91953f4faa9b20deb082df044
	Library/metadata/be/be01fc6e66cfb4f62a0f9b044d47382c
	Library/metadata/fe/fecf983bdbe0c4cff9c25dc38d051825
	TakeOutTheTrash-csharp.sln
	TakeOutTheTrash.sln