added delete column
added deleted column
merge conflict error
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
Merge pull request #25 from AdamAxtmann/master

Pull Contacts into Appointments
Merge branch forgotpassword into master
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	db/schema.rb
Fitness Controller with graphing
merge conflicts
..