did a bunch in 1.3.1
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	Assets/Graphics/Art/boulder-pooper/boulder-thrower_sprite.png.meta
	Assets/Graphics/Art/root-bridge/rb-sprite.png.meta