Thumbnails to show photos
Merge branch 'master' into photograph_list

Conflicts:
	templates/main/photograph_list.html
Merge pull request #14 from Paulina1/photograph_list

Photograph list