edited things and fixed things resizing and all
Merge remote-tracking branch 'origin/master'

Conflicts:
	Demo Assets/Assets/DemoScene.unity