Editing tree fire
Merge branch 'master' of https://github.com/Spikel/CompAudioMiniProject

Conflicts:
	Assets/main.unity
Updating tree fire