init
Merge branch 'master' of github.com:einarhjorleifsson/2014_iCod_sam

Conflicts:
	R/FLSAM_amended.R
	icod_sam.Rmd