New header and timeline adjustments
Merge branch 'master' of https://github.com/jlebensold/wie-web

Conflicts:
	app/views/layouts/application.html.erb