dummy commit

nothing reallly here
Revert "dummy commit"

This reverts commit 526c042fe5f90d11b30e1959240e254cef854344.
temp commit sunday 09/28
Merge remote-tracking branch 'origin/iago-programming' into iago-programming
sunday night 09/28 commit

-implemented a basic difficulty curve
-has several knob variables to fiddle with

-fixed the line not disappearing when its too small
-phantom line bug still eludes us
Merge branch 'iago-programming' into taylor-explosions

Conflicts:
	Assets/Prefabs/Dot - Blue.prefab
	Assets/Prefabs/Dot - Green.prefab
	Assets/Prefabs/Dot - Red.prefab
	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/guidmapper
	Library/metadata/48/482662a4f1333fc4ca45ef90de7704d6
	Library/metadata/5b/5b6ec4fe21bb1334b996b6bf635a29d7
	Library/metadata/b9/b9484a0ade2dcfe49830af313250c3ce
	Library/metadata/f8/f8c85edcf44b7ad44bc07810eafccb18
	Library/shadercompiler-1.log