Merge pull request #7 from floorman/master

Bug fixes, mainly
Commit for merge.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Started working on hud
Create README.md
started working on hud
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.
Update README.md
Added end of round score updating