Changed navbar so there wasn't an error during testing or in server
Merge branch 'master' of https://github.com/fox-squirrels-2013/brickbat into features_testing_fixes
Added Capybara::DSL to spec_helper
Added devise gem in order to test omniauth integration
Added tests, most are passing
Fixed merge conflict.