3
Merge branch 'master' of github.com:mrslave/contacts-spa

Conflicts:
	readme1.txt