added delete column
added deleted column
merge conflict error
merging
added dropdown in appointments to select doctor from contacts
Merge pull request #25 from AdamAxtmann/master

Pull Contacts into Appointments