add texting voicemail and fix merge conflicts
commit binary files
DS Store?
resolve DS_Store merge conflict
Merge pull request #4 from audibleblink/master

fix bugs and adds smarter texting feature
remove .DS_Store files and track in .gitignore file