Just Checking
Merge branch 'master' of https://github.com/manusaluja/artgallery
My Changes
Merge branch 'master' of https://github.com/manusaluja/artgallery

Conflicts:
	www/templates/navbar.html
Google CSS