added DS_Store to the git ignore file
Merge branch 'master' of https://github.com/chadmlinke/ContactViewer
Added contact data to the detail and edit activities.
Added contact data to the detail and edit activities