Merge remote-tracking branch 'origin/viky-last' into Sami-pagination

Conflicts:
.gitignore
assets/css/screen.css
index.html
pages/search.html