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