Mailer 1.0 setup
gemfile.lock change for production push
Activation emails implemented 1.0
Gemfile.lock
Merge branch 'emailing'

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	Gemfile.lock
	db/schema.rb