Changed player score to go by time not distance
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Assets/Scripts/PointsManager.cs
	Game2-csharp.v12.suo
	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/04/04c500d6ebb8403459ad4e44d4a35328
	Library/metadata/12/12e164431dbd8714bbde0aeef453b764
	Library/metadata/14/144032073d79c0644914a9fa2b44ce33
	Library/metadata/15/15165fd4162f640338fecd68f55abc28
	Library/metadata/19/19fb2eefdd5dffc40926407f1e877f90
	Library/metadata/1b/1badfd6944994af44b5ddf21766a94bc
	Library/metadata/2e/2e773be3c69e0ef49b8ae5ee2b644fbd
	Library/metadata/4d/4d0df73cbf6538643a28cd86df037645
	Library/metadata/67/67ee969cd76de204fabb3af9227ad2f3
	Library/metadata/6c/6c2b3cc909d408944b7528b7e39f4d38
	Library/metadata/82/82ca0ae319ab64341b8336b689389d6b
	Library/metadata/8d/8d847f26b6745fb4d9076f59a3cf0151
	Library/metadata/90/90d839770baeee54097f3c167e390010
	Library/metadata/a0/a06a264d250ef1d43927020192d8e492
	Library/metadata/a4/a40a40a3e330dd64b88859d19e82b8ec
	Library/metadata/c9/c91d13dd6a85732418472200f4abc68c
	Library/metadata/ca/ca40f53fcae3b4a108c0e7554c59a348
	Library/metadata/d6/d650d98b3c4028a4a8b7225c1a6482f8
	Library/metadata/d6/d6b1ee5e07651d74fa5f4b8f8adfbc9b
	Library/metadata/d7/d76cce1d794620346b2ef8868ec101e5
	Library/metadata/d9/d9a637e69b9f0a7449ee6b6e158ddd5b
	Library/metadata/e2/e2479b8e2325a7449816fdf70bd099fa
	Library/metadata/e4/e4e97d23f9bd614429d7e119e5d3cc51
	Library/metadata/e7/e7ef61ebb5c25394c8706a7ea658349f
	Library/metadata/ec/ec268c3ea1baceb4abb2168daed86f68
	Library/metadata/ee/ee72fbea51aca2f40b0e33c8ad517ecd
	Library/shadercompiler-1.log
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache