Revert "Revert "up""

This reverts commit e3bd81c2f8143302df15b937d8d9696c7980a5df.

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