sdfhsdghsdf
Merge branch 'master' of https://github.com/Bamboy/12-Seconds-Gamejam

Conflicts:
	Assets/Scenes/MainScene.unity
Merge branch 'master' of https://github.com/Bamboy/12-Seconds-Gamejam

Conflicts:
	Assets/Scenes/MainScene.unity
Merge branch 'master' of https://github.com/Bamboy/12-Seconds-Gamejam

Conflicts:
	Assets/Shaders.meta