Player slides around on ice
Merge pull request #1 from Kierz/master

Merge #1 - Rock class added
Start of menu implementation.
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Scenes.meta
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Stashing
Stashing
Merge pull request #2 from floorman/master

Player slides around on ice
Moved stuff