template change
Merge branch 'gh-pages' of github.com:tgherzog/ebola into gh-pages

Conflicts:
	assets/site/site.css