Sorted materials/prefabs/etc into folders and removed dupes.

Moved test player PreFab into MainScene and removed TestScene.
Merge pull request #2 from cplepel/Integration

Sorted materials/prefabs/etc into folders and removed dupes.
Added new player object (not yet prefab). Has rigidbody.

Changed input script to apply forces.
Joystick change + increased density of player object
Prototype health loss on collision
Added blowing mechanic. Player has a triangle trigger that applies an impulse to any souls that enter.
Minor update: Moved text update code to Update (not collision)
Jim's an idiot. Added missing files.
Not sure what this change even is!
Committing the new gitignore to also ignore obj/
Merge branch 'Collisions' of https://github.com/cplepel/GameJam into Collisions
This is the right gitignore.  Fucking Brinson.
Gitignore.
Added input functionality for 4 players.
Merge branch 'BlowingMechanic' of https://github.com/cplepel/GameJam into BlowingMechanic
Merge branch 'BlowingMechanic' into Develop

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/MainScene.unity
	ProjectSettings/InputManager.asset
	obj/Debug/Assembly-CSharp-vs.csproj.FileListAbsolute.txt
	obj/Debug/Assembly-CSharp-vs.csprojResolveAssemblyReference.cache
	obj/Debug/Assembly-CSharp.dll
	obj/Debug/Assembly-CSharp.pdb
Should be a working gitignore for .sln, .suo, and .csproj
Removing files that are not needed from Version Control.  These are NOT in gitignore.
VERSION CONTROL IS AWFUL.  FUCKING BRINSON.
Merge branch 'Collisions' into Develop

Conflicts:
	.gitignore
	GameJamGit-csharp.sln
	GameJamGit.sln