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
Revive plugins
Merge branch 'master' of https://github.com/sodevious/startupbus-na-2014-game
Ok, fixed nabvar markup
Fix fb oauth bug (couldnt sign in once I had signed out)
Add headers to views for users
WIP
Changes
Messy form for adding buses
Merge branch 'master' of https://github.com/sodevious/startupbus-na-2014-game
add investments to seed
active admin
schema