Merge pull request #33 from jdmielke/Conversation-Chat

Conversation chat is now working
addtolistmodel
testin
merge with john
ready for checkpoint2
Merge pull request #34 from travisreed-wf/novweek2

November Week 2: Use Phone as Contact Database
Merge pull request #8 from BlueText/master

Travis merge will have errors