Merge branch 'master' of https://github.com/kuoloneous/project-eli

Conflicts:
	Assets/Scenes/arcade.unity
	Assets/Scenes/main_menu.unity
Merge branch 'master' of https://github.com/kuoloneous/project-eli

Conflicts:
	Assets/Scenes/arcade.unity
	Assets/Scenes/main_menu.unity