ignore
Merge https://github.com/uknn/Formatif_DC1

Conflicts:
	.gitignore