Mailer 1.0 setup
gemfile.lock change for production push
Merge pull request #24 from AdamAxtmann/master

Allergies is so pretty
implement session timeout 1.0 (30 minutes)
fix bug with create phr
sessions expiry implemented. seems to be working
Merge branch 'sessionExpiry'
update session expiry action
added delete column
added deleted column
merge conflict error
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
fixing bug with session timeouts
commenting out session timeout until bugs are worked out
Reactivating session timeout with bugs fixed. Added small change to Mailer
merging
added dropdown in appointments to select doctor from contacts