updates
Merge branch 'master' of https://github.com/lpommers/KEA_Gallery

Conflicts:
	style.css