RFR

Finished testing to show all coffee shops at shops#index
You'll want to delete this file -- otherwise we'll have two migrations to create the users table.

(We didn't encounter a merge conflict with this file because the timestamps in the filenames are different, so they are in fact different files and git will treat them as such.)