Added the final part
Added collision
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	Assets/Alex.unity
Hand in version
Presentation changes