working with torch again, particle effects
no empty commit messages!!!!
Merge branch 'master' of https://github.com/dustinyoste/Wispy

Conflicts:
	Assets/Scenes/DemoWorld2.unity