added navbar button
before merge upstream
solve merge conflict
working on homepage
Merge pull request #41 from buck3000/feature/nav-bar

Feature/nav bar
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
fix conflicts
Merge pull request #43 from raderj89/master

fix conflicts
resolve conflict
Merge branch 'test/controllers/searches_controller'