Merge pull request #3 from floorman/master

Updates to moving and shooting
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
Commit.
Menu stuff again
Commit that should hopefully not delete my stuff.....
Update of some menu stuff.
Updated of options menu for volume control.
fucking git