Adding Maz's changes
More Maz changes
Merge branch 'master' of https://github.com/mazhermon/exhibition

Conflicts:
	css/img/pagination.png
	js/jquery.slides.min.js
Minor layout change