updated mechanics
Merge branch 'master' of https://github.com/Tarwine/otroniconJam

Conflicts:
	Assets/Scenes/testMechanics.unity