Test 3
another change
Merge branch 'master' of https://github.com/kathypennacchio/kathypennacchio.github.io

Conflicts:
	_posts/2014-08-06-ebola-map.md