Update README.md
Update README.md
Update README.md
Merge conflicts fixed
Fixing merge conflicts
DB file
Begins working towards a restaurant admin addition and subtraction
Sets up basic logic to assign an admin or stocker
Allows for the firing process
Generates test for employee hiring and firing
Sets up basic editing functions
Sets up thin and memcached
update seed data
Merge branch 'master' of github.com:pzula/fourth_meal into staging
Merge branch 'finish_user_test' of github.com:pzula/fourth_meal into finish_user_test
Merge conflict fixes
Merging finish_user_test with admin branch - yay