fire and shingles
Merge branch 'master' of https://github.com/DavidBocek/SmokeAndMirrors

Conflicts:
	SmokeAndMirrors/Assets/Sounds/fire-1.wav.meta
	SmokeAndMirrors/Assets/textures/shingles.jpg.meta