merging
merging
Merge github.com:floorman/UOP-Gamejam-2014
Updated Rock
Camera now follows the stone that has been shot