Stashing
HUD Script is terribly inefficient?
a
Merge pull request #22 from Kierz/master

Merge #7
Stashing.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Fixed a bug where Rock.cs called missing rigidbody
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

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

Bug fix and optimisations