Merge branch 'team_and_bus_models' of https://github.com/sodevious/startupbus-na-2014-game
Working on component styles
Fixing merge conflicts
Fixing navbar with new omniauth
debugging fb error
Merge branch 'master' of https://github.com/sodevious/startupbus-na-2014-game
Merge branch 'master' of https://github.com/sodevious/startupbus-na-2014-game
Ok, fixed nabvar markup