Merge pull request #44 from aidanoleary/master

Added a EndOfRound script and EndOfRound scene
made some changes to set friction in rock class
stashing
Credits are now done and looking all fancy like...
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/Credits.cs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge pull request #45 from Kierz/master

scrubs should have a bigger effect now
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
Merge pull request #46 from floorman/master

Fancy creditz n shit, yo
Added team sounds and some menu stuff.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Scenes/RinkMain.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
commit