git ignore in master needed to be changed
Merge branch 'master' of https://github.com/marouen-lamiri/Second-Soul

Conflicts:
	.gitignore