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.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Commit.x
still merging
still merging
Merge pull request #21 from Kierz/master

Merge #6
UI implementation take 2.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/HudScript.cs
	Assets/Code/Rock.cs
	Assets/Scenes/DansTest.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	UOP-Gamejam-2014.userprefs
commit.
Stashing
Fixed issue with volume float.
Fixed volume error.
HUD Script is terribly inefficient?
a