braaah
Level and obstacle done
Merge branch 'master' of https://github.com/Seltora/NextSideScroller

Conflicts:
	.gitignore
	Project Folder/Assets/MatiasScene.unity
	Project Folder/Assets/Prefabs/Cube.prefab
	Project Folder/Assets/Scripts/Obstacle.cs