Merge branch 'master' of https://github.com/jmarks1992/CS109

Conflicts:
	Project.ipynb
	brewer2mpl/__init__.pyc
	brewer2mpl/brewer2mpl.pyc
Merge branch 'master' of https://github.com/jmarks1992/CS109

Conflicts:
Project.ipynb
brewer2mpl/__init__.pyc
brewer2mpl/brewer2mpl.pyc