animator
Merge remote-tracking branch 'origin/master'

Conflicts:
	GBJAM/Assets/Art/Interactive/barrel.png.meta
	GBJAM/Assets/Art/Interactive/brick.png.meta
	GBJAM/Assets/Art/Interactive/crate.png.meta
	GBJAM/Assets/Art/Interactive/girder.png.meta
	GBJAM/Assets/Art/Interactive/plank.png.meta
	GBJAM/Assets/Art/Interactive/rock.png.meta
	GBJAM/Assets/Art/Interactive/rock2.png.meta