buggy commit
score multiplier added
tuesday class work
check
no message
check
player prefs usage started

-added prefs support for the volume control
on both the main menu and
the game menu
Merge remote-tracking branch 'origin/iago-programming' into iago-programming

Conflicts:
	Library/shadercompiler-1.log

conflict merger
messing with floating point text
Merge branch 'iago-programming' into Taylor10-7-2014

Conflicts:
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/shadercompiler-1.log
10/12 sunday work

-high score tracker added, need UI element
-freeze powerup removed from spawner
-added code for the forgotten difficulty cap for the shrinkings
didnt really get anything done
added some sound effects, and got the complements to spawn in the right place
updated the loading screen
blargh