nothing much
Merge branch 'master' of https://github.com/Sateanu/gamejam

Conflicts:
	MadNorSane/MadNorSane/Characters/Player.cs
collision filtering sort of work
Merge branch 'master' of https://github.com/Sateanu/gamejam