Merging, Adding kiran test scene
Merge branch 'master' of https://github.com/emretanirgan/sxsw

Conflicts:
	sxsw/Assets/Materials.meta
	sxsw/Assets/PreFabs.meta
	sxsw/ProjectSettings/Physics2DSettings.asset
New character controller
Merge branch 'master' of https://github.com/emretanirgan/sxsw

Conflicts:
	sxsw/ProjectSettings/Physics2DSettings.asset
	sxsw/ProjectSettings/QualitySettings.asset
	sxsw/sxsw.userprefs