Changed display of additional images
Merge branch 'master' of https://github.com/johanbergman/portfolio

Conflicts:
	source/projects/template.html.erb