created better back button
changing order confirmation so it renders better
Super admin can now change the status of restaurants
merge conflict
fixing footer to be more generic
fix OrderItemControllerSpec
restaurant mailer spec passing after sending approve/reject emails to all restaurant owners
fix specs
hm
ok, test passing for reals now
merging with staging
creating description and option for city location on restaurant form
restaurants are sorting by city
pagination for restaurant index working
formatted city list a little better
Merge pull request #11 from thewatts/pagination

Pagination
merging with map-json
merging with staging
adding coordinates to city table and seed data