trying to merge
trying to merge
trying to merge
trying to merge
trying to merge
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
Update README.md
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014
Commit.
committing bulllshit again
Merge pull request #13 from Kierz/master

Merge #4
Added TeamOneStonesLeft and TeamTwoStonesLeft
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014
Merge pull request #14 from Kierz/master

Merge #5