disregard

1.001
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Sprites/Block.jpg.meta
	Assets/Sprites/johnnyattack.png.meta
	Assets/Sprites/johnnyhit.png.meta
	Assets/Sprites/johnnyjump.png.meta
	Assets/Sprites/johnnyrunning.png.meta
	Assets/Sprites/sky.png.meta
	Assets/enviroment blocks/sidewalk.png.meta