Fixed layout, body padding so nav doesn't overlap
Merge branch 'feature/navbar' into develop

Conflicts:
	app/views/layout.erb