merge
Merge branch 'master' of github.com:pollow/Contacts
server init