Wire up cancel button
Add Ability to Search By First AND Last Name
resolving merge conflicts
Idk what this stuff is
add contacts to file and read from file
Create New Contact Hanlding
Menu Working?
Contact validation on edit contact
resolving merge conflicts and pulling upstream
a few bugfixes and merge conflict resolutions
changes to gitignore
remove some testing code
change conversation view to how it had been
try again
try again
add imports
other conversation changes
Merge pull request #26 from travisreed-wf/october4

October Week 4
Merge pull request #9 from BlueText/master

Take in Travis's changes