Deleted users from database.yml, remove migration file conflicting with admin
remove_admin migration file has been removed
Merge pull request #5 from jackson-sandland/Fixing_Model_Migration

Fixing model migration
config.action_mailer.perform_deliveries = false
database.yml username/database name changed back to reservation
Merge pull request #6 from fnc314/controller_work

Controllers and spec files generated
Merge pull request #7 from fnc314/extra_migrations

Extra migrations
first seed data affiliation with reservations
Merge pull request #8 from darrenwong916/seed_data

first seed data affiliation with reservations
Merge pull request #9 from fnc314/extra_migrations

added restaurant id to table and server models
added more seed data
Merge pull request #10 from darrenwong916/seed_data

added more seed data
Added Server_ID column to Tables for association