Border and space
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/gallery.css
Merge remote-tracking branch 'origin/master'
Border and space
Changed to photo
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/gallery.css
Changed to photo