testing db
change gemfile for compatibility
changed the gemfile back
testing git
fixing merge
Merge branch 'master' of https://github.com/ekadas/erestaurant into wojtek
Tests for order_controller.rb - updated1