git coomit -a
Merge github.com:mdiedhiou/firstApp

Conflicts:
	.gitignore