cleaned up
Merge branch 'master' of https://github.com/lundinn/atlantis_iceland

Conflicts:
	ia_draft_report/iceland_atlantis_draft.html
	ia_draft_report/iceland_atlantis_draft.md
	ia_rscripts/biology_submodel/biolprm.R
	ia_rscripts/biology_submodel/iabioparams_excel.R
	ia_rscripts/initial_conditions/mammal_initial.R