Merge remote-tracking branch 'origin/master'

Conflicts:
	home.html

merp
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	home.html