adding MAR layers, plus China data creation
working MAR function with new layers
MAR incorporated with Rmd
MAR updated, FIS in progress
MAR really working with layers now
in process with LE function, moved ohigui's AggregateLayers.R into ohicore
updated documentation since adding AggregateLayers.R
Merge pull request #19 from Melsteroni/master

Updating Global2013www2013 data with new sea ice
Merge pull request #21 from Melsteroni/master

Updating Global2013www2012 data
committing before merging Melanie's latest
Merge pull request #22 from Melsteroni/master

Cutting sea ice data for countries without persistent sea ice
merging Mel's latest with mine

Merge branch 'master' of https://github.com/OHI-Science/ohicore into OHI-Science-master

Conflicts:
	inst/extdata/data_create.R
	inst/extdata/layers.Global2012.www2013.csv
	inst/extdata/layers.Global2013.www2013.csv
Merge pull request #23 from bbest/master

merging bbest stuff
Delete mexico-bs.csv
Delete tmp_dput.txt
Delete status_model_curref.csv
Merge pull request #2 from OHI-Science/master

clear erroneous files
reran devtools::document() and load_all() to clean up DESCRIPTION and NAMESPACE to fix error #26
another attempt at explicitly adding export of Conf and Layers to fix #26
Merge pull request #27 from bbest/master

fixed #26 by explicitly adding export(Conf) to NAMESPACE