.gitignore is now working @ work :)
Merge branch 'master' of ssh://github.com/elvirag/General

Conflicts:
	Maman 12 - Q1 - Adv Java/.settings/org.eclipse.jdt.core.prefs
	Maman 12 - Q2 - Adv Java/.settings/org.eclipse.jdt.core.prefs