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
committing before merging Melanie's latest
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