Worked on the front-end and back-end,
-home
-min profil
(almost done)
Merge remote-tracking branch 'origin/master'