updating master
hooked up the settings knobs
bullshit
Merge branch 'taylor09-30-2014'
updating the dot textures in my branch
working with the background color
Merge branch 'Neal_UI' into taylor09-30-2014

Conflicts:
	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/guidmapper
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/14/144032073d79c0644914a9fa2b44ce33
	Library/metadata/48/482662a4f1333fc4ca45ef90de7704d6
	Library/metadata/5b/5b6ec4fe21bb1334b996b6bf635a29d7
	Library/metadata/9e/9e5eed2d0075c45a2b9dad118b4a3ecb
	Library/metadata/b9/b9484a0ade2dcfe49830af313250c3ce
	Library/metadata/d7/d76cce1d794620346b2ef8868ec101e5
	Library/metadata/da/da75cc62cdbce4855bbeb48963d3c20f
	Library/metadata/e4/e4e97d23f9bd614429d7e119e5d3cc51
	Library/metadata/ee/ee72fbea51aca2f40b0e33c8ad517ecd
	Library/metadata/f8/f8c85edcf44b7ad44bc07810eafccb18
	Library/shadercompiler-1.log
power ups work

-power ups spawning
-no logic code for each one yet
-power ups have a weighted chance to spawn over others
updated the game
Merge branch 'taylor09-30-2014'
Merge branch 'iago-programming'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	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/guidmapper
	Library/metadata/25/2533dcde9be10e64f9c31912177427fd
	Library/metadata/27/27275fc7df2ec0346ba12831e6a01345
	Library/metadata/37/37590480333382341b5007dec2a032c6
	Library/metadata/9e/9e5eed2d0075c45a2b9dad118b4a3ecb
	Library/metadata/b9/b9484a0ade2dcfe49830af313250c3ce
	Library/metadata/da/da75cc62cdbce4855bbeb48963d3c20f
	Library/shadercompiler-1.log
merged all files and made function. added particle effects to power ups
update
got some of the power ups working
buggy commit
score multiplier added
tuesday class work
check
no message
check