changes
fixed conflicts
fixed hover
pics formatted
merge
Merge branch 'master' of github.com:myfashionhub/time-backend
new div for text
Merge branch 'master' of github.com:myfashionhub/time-backend