gitignore change
Merge branch 'master' of https://github.com/biometry/APES

Conflicts:
	.gitignore