Adding the pagination on the index page
Adding pagination on search
Merge branch 'master' into pagination

Conflicts:
	index.html