collision fixes
added resolution notes
Merge branch 'master' of https://github.com/AndrewCarvalho/Tojam8

Conflicts:
	2d collider test/Assets/Scripts/Actor.cs