update to time.
merging changes.

Merge branch 'master' of github.com:UMassAmherst-GRiD/UMassAmherst-GRiD.github.io

Conflicts:
	_posts/2014-11-10-ebola-hackfest.md