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.
Fixed serious fps loss in hud script