pulled latest
Merging files
Did more work on HUD
Merging latest
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Made changes to HudScript also created Hud Scene
pull request from upstream
Merge pull request #11 from aidanoleary/master

More work on HUD
Stashing.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Update README.md
Update README.md
Update README.md
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014
Commit.
committing bulllshit again