Started placing obstilces
Merge branch 'origin/master'

Conflicts:
	Assets/Alex.unity