colorPicker added
Adding player controller and basic stage for testing
turret is craft
Merge branch 'feature/turretCrafting' into develop

Conflicts:
	ColorsForever/Assembly-CSharp-vs.csproj
	ColorsForever/Assembly-CSharp.csproj
	ColorsForever/ColorsForever-csharp.sln
	ColorsForever/ColorsForever.sln
	ColorsForever/ColorsForever.userprefs
	ColorsForever/Library/CurrentLayout.dwlt
	ColorsForever/Library/ScriptAssemblies/Assembly-CSharp.dll
	ColorsForever/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ColorsForever/Library/assetDatabase3
	ColorsForever/Library/guidmapper
colors and things
Added LevelKit sprite sheet.
Added first version of CharacterKit
added color changer
Merge branch 'develop' of https://github.com/soggychips/ColorDare into feature/Sprites

Conflicts:
	ColorsForever/ColorsForever-csharp.sln
	ColorsForever/ColorsForever.sln
	ColorsForever/Library/CurrentLayout.dwlt
	ColorsForever/Library/ScriptAssemblies/Assembly-CSharp.dll
	ColorsForever/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ColorsForever/Library/assetDatabase3
	ColorsForever/Library/guidmapper
	ColorsForever/Library/metadata/15/15306823f5cd4400696f144441e41c07
	ColorsForever/Library/metadata/2b/2bf035c22a6ecc94ab75037a0291c445
	ColorsForever/Library/metadata/3e/3e07c987025954442ba485a675c03c13
	ColorsForever/Library/metadata/5d/5d9dc2c37e9d6074aa74249a357da511
	ColorsForever/Library/metadata/a0/a0618b1d9d7f44acc9c0cc8865198206
	ColorsForever/Library/metadata/aa/aa51bf53bbc528943a96a3c2897ac3dd
	ColorsForever/Library/metadata/b0/b0c14af3838124affa9f68db3f6f0707
	ColorsForever/Library/metadata/bf/bfbe9a2a68aaf474eaf3b46419cb049e
	ColorsForever/Library/metadata/fa/fabb83e1797254f6bbc87cbc3637f79d
Merge branch 'develop' of https://github.com/soggychips/ColorDare into feature/Sprites
Merge branch 'feature/Sprites' into develop
added char reset on bullet hit
adding multiplayers and joystick support
added moar mplayer stuff
Adding more multiplayer with xbox controllers and a template level to start with
adding more prefab for levelone
saw shit workin'
Merge branch 'feature/saw_34' into develop

Conflicts:
	ColorsForever/ColorsForever-csharp.sln
	ColorsForever/ColorsForever.sln
	ColorsForever/ColorsForever.userprefs
	ColorsForever/Library/CurrentLayout.dwlt
	ColorsForever/Library/InspectorExpandedItems.asset
	ColorsForever/Library/ScriptAssemblies/Assembly-CSharp.dll
	ColorsForever/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ColorsForever/Library/assetDatabase3
	ColorsForever/Library/guidmapper
	ColorsForever/Library/metadata/6d/6da60a5945106504e93dca5eeb278f53
	ColorsForever/ProjectSettings/InputManager.asset
new color picker
Adding second Level and level switch