first local commit
commit local (Macbook)
Merge branch 'master' of https://github.com/pipifix/dev-harmonie
Merge branch 'master' of https://github.com/pipifix/dev-harmonie
Merge branch 'master' of https://github.com/pipifix/dev-harmonie
some minor changes to blog layout
Merge branch 'master' of https://github.com/pipifix/dev-harmonie
homepage content parts and button styles
test new commit type
Merge branch 'master' of https://github.com/pipifix/dev-harmonie

Conflicts:
	assets/Uploads/sliderimages/apsmall.jpg
	assets/Uploads/sliderimages/augustusplatz.jpg
	themes/stylezoo/.sass-cache/1d98f1a0142d5e39371dd33ecacdcc29436c82c3/_css3.scssc
	themes/stylezoo/.sass-cache/1d98f1a0142d5e39371dd33ecacdcc29436c82c3/_reset.scssc
	themes/stylezoo/.sass-cache/1d98f1a0142d5e39371dd33ecacdcc29436c82c3/_support.scssc
	themes/stylezoo/.sass-cache/1d98f1a0142d5e39371dd33ecacdcc29436c82c3/_typography.scssc
	themes/stylezoo/.sass-cache/1d98f1a0142d5e39371dd33ecacdcc29436c82c3/_utilities.scssc
	themes/stylezoo/.sass-cache/237c99efbb1d90f6af534a8311963bcb5df4a5d0/_links.scssc
	themes/stylezoo/.sass-cache/237c99efbb1d90f6af534a8311963bcb5df4a5d0/_lists.scssc
	themes/stylezoo/.sass-cache/237c99efbb1d90f6af534a8311963bcb5df4a5d0/_text.scssc
	themes/stylezoo/.sass-cache/310f629e8ef94d2adf4d99892b5bc0c2583d8915/_inline-block-list.scssc
	themes/stylezoo/.sass-cache/585ec41cb2aa1b468eaedf0d12612071bb750d9d/_force-wrap.scssc
	themes/stylezoo/.sass-cache/585ec41cb2aa1b468eaedf0d12612071bb750d9d/_nowrap.scssc
	themes/stylezoo/.sass-cache/716f3df784113d15adb39e0cf5ff972cf9ea1fe9/_clearfix.scssc
	themes/stylezoo/.sass-cache/716f3df784113d15adb39e0cf5ff972cf9ea1fe9/_reset.scssc
	themes/stylezoo/.sass-cache/716f3df784113d15adb39e0cf5ff972cf9ea1fe9/_tag-cloud.scssc
	themes/stylezoo/.sass-cache/7864821b4ace725cbef37091b09c5dc8fc9347eb/_hover-link.scssc
	themes/stylezoo/.sass-cache/7864821b4ace725cbef37091b09c5dc8fc9347eb/_link-colors.scssc
	themes/stylezoo/.sass-cache/7864821b4ace725cbef37091b09c5dc8fc9347eb/_unstyled-link.scssc
	themes/stylezoo/.sass-cache/80c0521a25125fcd2fc5302dfad728424e38f175/_contrast.scssc
	themes/stylezoo/.sass-cache/c66892f5df9636ec278c3ad6820678a6ca8ed2e0/_color.scssc
	themes/stylezoo/.sass-cache/c66892f5df9636ec278c3ad6820678a6ca8ed2e0/_general.scssc
	themes/stylezoo/.sass-cache/c66892f5df9636ec278c3ad6820678a6ca8ed2e0/_sprites.scssc
	themes/stylezoo/.sass-cache/c66892f5df9636ec278c3ad6820678a6ca8ed2e0/_tables.scssc
	themes/stylezoo/.sass-cache/c950f2cfb168af4167f2f2d33accdff63b055c1a/_alternating-rows-and-columns.scssc
	themes/stylezoo/.sass-cache/c950f2cfb168af4167f2f2d33accdff63b055c1a/_scaffolding.scssc
	themes/stylezoo/.sass-cache/d3410be493b6d4a6de45568f5d8c1b3a60e8aa8c/_compass.scssc
	themes/stylezoo/css/x_gumby.css
	themes/stylezoo/js/libs/gumby.min.js
	themes/stylezoo/sass/x_gumby.scss