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
Rock camera now resets properly after gettign a new rock, also made the player switch teams after firing and only fires their own teams rocks
Started working on hud
Create README.md
wasting my time on git again
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
Update README.md
Update README.md
Added end of round score updating
Merge pull request #9 from Kierz/master

Merge #3
Stashing
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper