Fixing the site...
Merge branch 'master' of https://github.com/jjwebstuff/colorbox

Conflicts:
	_site/about.html
	about.html