Merge branch 'master' of https://github.com/ebolapocalypse/ebolapocalypse.github.io

Conflicts:
	hospitals.html
merp