Removed old gemfile.lock that had old multi_json
Removed old gemfile.lock that had old multi_json
Cleaned up migrate files for users, finished email. Required environment variables are in google doc.
Merge pull request #38 from badnack/development

Development
Cleaned up migrate files for users, finished email. Required environment variables are in google doc.
Added default_url_options to production.rb
schema.rb?
Merge pull request #39 from badnack/development

Development
Merge remote-tracking branch 'upstream/development' into development
schema
fixed papeclip