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
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
commit
upstream's RinkMain scene
merging
commit
Merge pull request #44 from aidanoleary/master

Added a EndOfRound script and EndOfRound scene