Changed update currentPlayer function
pull request
Merge pull request #17 from Kierz/master

Added TeamOneStonesLeft and TeamTwoStonesLeft
commit
Merge pull request #18 from aidanoleary/master

pull request
Final commit.
Added sprites
pull
Merge pull request #19 from aidanoleary/master

Added sprites and textures
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	UOP-Gamejam-2014.userprefs
Backup push before fixing the game
Backup push before fixing the game
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/Player.cs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Merge pull request #20 from floorman/master

Backup push before fixing the game
merging again
still merging
Added UI to dansTest.unity.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Scenes/DansTest.unity
Fixing dansTest.unity.