- mockup up
Merge branch 'master' of https://github.com/CyrilleGuimezanes/entreprenarialmarketing

Conflicts:
	Companion/app/src/main/res/drawable-mdpi/f5.png