config
Merge branch 'master' of https://github.com/LaminatovejDemon/Prototype_1

Conflicts:
	Assets/scn/main.unity