test
Merge branch 'master' of https://github.com/Seltora/NextSideScroller

Conflicts:
	Project Folder/Assets/MatiasScene.unity
	Project Folder/Assets/Prefabs/Cube.prefab
	Project Folder/ProjectSettings/EditorSettings.asset