Update of brushing mechanic script and some HUD changes.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
Fix the main menu.
Update README.md
Update README.md
Rock fires correctly, friction can be changed from external classes via rock.SetFriction(float 0-1) and added a camera trolley which follows the player as the player moves
Rock fires correctly, friction can be changed from external classes via rock.SetFriction(float 0-1) and added a camera trolley which follows the player as the player moves
Merge pull request #27 from Kierz/master

Merge #10
Stashing
Merger.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/Player.cs
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems