message
Fixes merge conflicts.
Fixes more merge conflicts.
updates gemfile and gemfile.lock.
finish user sign up
Use SSL and Unicorn in Production