Merge pull request #8 from aidanoleary/master

Started working on hud
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Addition of some score/UI code.
Merging files