Some improves on forest fire
Merge branch 'master' of https://github.com/swook/project-bambi

Conflicts:
	code/main.m