Merge branch 'master' of https://github.com/doggydigit/miniprojet1

Conflicts:
	mini-projet1-empty/src/test
tout