gitignore
trash
Merge branch 'master' of https://github.com/oanasuciu/compilateur1

Conflicts:
	.gitignore