first commit
first commit
Merge branch 'master' of https://github.com/slugbucket/phonebook

Conflicts:
	.gitignore