added fire
Merge branch 'master' of github.com:Pjchardt/PinkElephant

Conflicts:
	Assets/Levels.meta
	Assets/Levels/fire.prefab
	Assets/Levels/lightcontrol.cs
	Assets/Levels/triangle.png
	Assets/Levels/tris.mat