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
Merge pull request #7 from BlueText/master

pull in travis's changes for October week 4
Merge pull request #25 from Hartman2/master

Week of October 27th merge
Merge pull request #8 from BlueText/master

Take in Andrew's pull request October week 4
resolving merge conflicts and pulling upstream
a few bugfixes and merge conflict resolutions
changes to gitignore
remove some testing code
Adding support for different object types coming through the stream, namely Contact objects.
Adding BlueTextRequest object which will be communication protocol object between phone and PC applications.
change conversation view to how it had been
try again
try again