Stashing.
Merge pull request #15 from floorman/master

Trying out new sliding
Started adding sprites to hud
Commit
Merge pull request #16 from aidanoleary/master

Started adding sprites to hud
Commit.
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Added TeamOneStonesLeft and TeamTwoStonesLeft
Changed update currentPlayer function
Added TeamOneStonesLeft and TeamTwoStonesLeft
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.