Update Seed Data and Gemfile
update seed file
Merge branch 'order-detail-flukes' of github.com:pzula/fourth_meal into public_visitor_branch

Conflicts:
	db/test
update seed data
Fixing merge conflicts
Updating URL
Updating URL
Merge branch 'admin' into staging

Conflicts:
	db/test
Sets up error messages for restaurant creation
Restaurant Admins have link to restaurant-dashboard
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