Add bootstrap to asset pipeline and create navigation bar
Style layout for static pages
Resolve auto-merging conflicts