merged updates
merged updates

Merge branch 'master' of github.com:Open-Data-Science-at-SIO/Intro-Data-Viz-Winter-2017

# Conflicts:
#	README.md

Open-Data-Science-at-SIO/Intro-Data-Viz-Winter-2017,Open-Data-Science-at-SIO/Intro-Data-Viz-Winter-2017