remove city/state/zip, add quantitiy migrations
Merge pull request #53 from fox-squirrels-2013/shadi-test

remove city/state/zip, add quantitiy migrations
Add proper 12 hour format to time on event show page.
Merge pull request #54 from fox-squirrels-2013/date_time

Add proper 12 hour format to time on event show page.
Merge branch 'master' of https://github.com/fox-squirrels-2013/potluck into creation_event_page
before pull request, I want to resolve merge conflicts locally