Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
margin bottom gallery
about section
Merge branch 'master' into gh-pages

Conflicts:
	css/main.css
slideshow retina
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	css/main.css
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	css/main.css
	index.html
thumbnail colibri
new pictures + portrait
Merge branch 'master' into gh-pages

Conflicts:
	css/main.css