ADD files to ignore list
IGNORE .aux files
Cleanning git beahviour
Resolve conflicts
Merge branch 'master' of https://github.com/MarieEtienne/ICCAT-BFT

Conflicts:
	.gitignore