commit
pull from upstream
Fixed merge conflicts
commit
commit
pull
Added aiming arc and pointer

Need to come up with a way of adjusting the pointer dependent on rock
direction
pulled from upstream
Adding of new team sounds (whoa, hard etc)
Merge pull request #43 from floorman/master

Re-doing credits and other code updates
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Scenes/RinkMain.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Added a endOfRound Script and scene

-added a roundCounter in GameManager
-added a EndOfRound scene
-added a accessor method for roundCounter (called getRound()) in
gameManager
-added a EndOfRound Script
-added Application.LoadLevel to EndOfRound function
Adding of new sounds items. Also updates MainMenu and options menu.
commit
upstream's RinkMain scene
merging
commit
Merge pull request #44 from aidanoleary/master

Added a EndOfRound script and EndOfRound scene
made some changes to set friction in rock class