pulled latest
Merging files
trying to merge
trying to merge
trying to merge
Did more work on HUD
Merging latest
trying to merge
Merge pull request #12 from floorman/master

More bug fixes
trying to merge
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
Attempts at fixing rock firing with correct velocity
Update README.md
Update README.md