maj
Merge branch 'master' of https://github.com/fitzlucassen/portfoliov2

Conflicts:
	Logs/log.txt
soucisprojet