commit
pull
HUD stones calculated correctly
commit
Modified some friction values.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/Rock.cs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
commit
Merge pull request #54 from aidanoleary/master

HUD working
Commit.
Commit -a
Finally back up to date
Stashing