Initial commit
Merge branch 'master' of https://github.com/livet01/corrigeaton

Conflicts:
	.gitignore
update gitignore