Maj P
Merge branch 'master' of https://github.com/babawy/TrendyTieApp

Conflicts:
	web/img/sample/profil1.png
	web/img/sample/profil2.png