First commit
gitignore
Merge branch 'master' of https://github.com/rgirodon/pronoApp

Conflicts:
	.gitignore