First Revision
Merge https://github.com/oussayd/contactapp

Conflicts:
	.gitignore
merge