Merge branch 'master' of github.com:sburlot/phonecalls

Conflicts:
README.md
Merge branch 'master' of github.com:sburlot/phonecalls

Conflicts:
	README.md