merging
New assets
Merge branch 'master' of https://github.com/emretanirgan/sxsw

Conflicts:
	sxsw/Assets/Block.mat
	sxsw/Assets/Materials/FireMat3.mat
	sxsw/Assets/Materials/Trail.mat
	sxsw/Assets/Scripts/Portal.cs
	sxsw/Assets/Scripts/Slip.cs
	sxsw/ProjectSettings/QualitySettings.asset