commented out routes.rb
Merge branch 'master' of https://github.com/noj33/JAB_project
fixed user routes
tried fixing routes.rb
fixed routes again
containers added
Merge branch 'Jon' of https://github.com/noj33/JAB_project into Jon