Fixed a bug where the player could shoot multiple times
Added some menu stuff
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Code/menuScript.cs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
	UOP-Gamejam-2014-csharp.sln
	UOP-Gamejam-2014.sln
	UOP-Gamejam-2014.userprefs
merging
Hopefully fixed the .gitignore
merging
Merge github.com:floorman/UOP-Gamejam-2014
Commit.
Updated Rock
Menu stuff again
Commit that should hopefully not delete my stuff.....
Update of some menu stuff.
Camera now follows the stone that has been shot
Updated of options menu for volume control.
Stashing.
Commit for Krz
Commit.
Commit.
Commit.
Slight bug for deceleration, bug other than that stones are prefabs