create passing TestDiner tests
rename DinerController to DinerStorage
fixing merge conflicts
Merge pull request #50 from KimpossibleG/testing

Testing