changed login text, started to make user view
Merge branch 'Monday'
commented out routes.rb
Bootstrap working now
Merge branch 'master' of https://github.com/noj33/JAB_project
add containers database
fixed user routes
tried fixing routes.rb
fixed routes again
containers added
containers added
Merge branch 'Jon' of https://github.com/noj33/JAB_project into Jon
added links to containers
Working on sign in / sign up page added name to users table
added stuff
removed bad code from routes
adding Omniauth Twitter
db merge fix
editing css
Omniauth Twitter Working