Tweaked boomerangs to go through each other

If they are the same players boomerangs
Tweaked player so he doesnt fall through floor
Merge remote-tracking branch 'origin/master' into Win

Conflicts:
	Assets/Scenes/level_01.unity
	ProjectSettings/Physics2DSettings.asset