Keeping up to date.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/GameManager.cs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
The options script will be renamed.
Added BrushTest.cs
Camera switch to Player camera is now decided when the rock stops moving not a predefined time
Camera switch to Player camera is now decided when the rock stops moving not a predefined time
Merge pull request #29 from Kierz/master

Merge #12
Fixed updated friction bug
Merge pull request #30 from Kierz/master

Merge #13
Addition of materials.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
merge