Merge branch 'navBar'
Merge branch 'master' of https://github.com/ClutchMederow/whip
Added layout.js for routing info