Merging changes
Merging changes

Merge commit '65c7074187d5ad2c6937155bc05bb25b741ed606' of https://github.com/DataStrategist/TileMaker

# Conflicts:
#	docs/articles/Intro.html
#	vignettes/Intro.Rmd

mexindian/TileMaker,mexindian/TileMaker