...
Merge branch 'master' of https://github.com/Kris-B/nanoGALLERY

Conflicts:
	README.md
	css/nanogallery.css
	demonstration.html
	jquery.nanogallery.js
	nanogallery.jquery.json