Adding vaporTrails
committing files pre-merge
Merge branch 'master' of https://github.com/LambdaRed/vision_quest

Conflicts:
	Assets/Materials/Smoke.mat