3rd session
Merge remote-tracking branch 'origin/master'

Conflicts:
	jamaica/forest_fire.py