commit db fix
Merge branch 'development' of https://github.com/brendancwood/nodeRestaurantApp into john
Merge branch 'development' of https://github.com/brendancwood/nodeRestaurantApp into development
fixed connection issue
Merge branch 'development' of https://github.com/brendancwood/nodeRestaurantApp into development
commit changes with timer
Merge branch 'development' of https://github.com/brendancwood/nodeRestaurantApp into development
Merge branch 'development' into john
commit admin page
Merge branch 'development' of https://github.com/brendancwood/nodeRestaurantApp into development
Merge branch 'development' into john
commit changes to admin.js
commit new
commit
commit admin form to add new restaurant
fixed merge conflict