file2- created
Merge branch 'master' of git://github.com/quatrocircle/addressbook1