speram
Merge branch 'master' of https://github.com/ferdydurque/filippo.dev

Conflicts:
htdocs/wp-content/themes/ottomar-5/codekit-config.json
htdocs/wp-content/themes/ottomar-5/library/css/ie.css
htdocs/wp-content/themes/ottomar-5/library/css/style.css
htdocs/wp-content/themes/ottomar-5/library/js/widgets-ck.js
htdocs/wp-content/themes/ottomar-5/library/js/widgets.js
htdocs/wp-content/themes/ottomar-5/library/less/_base.less
htdocs/wp-content/themes/ottomar-5/library/less/_mixins.less
htdocs/wp-content/themes/ottomar-5/library/less/pages/splash.less
htdocs/wp-content/themes/ottomar-5/page-slideshow-works.php
Merge branch 'master' of https://github.com/ferdydurque/filippo.dev

Conflicts:
	htdocs/wp-content/themes/ottomar-5/codekit-config.json
	htdocs/wp-content/themes/ottomar-5/library/css/ie.css
	htdocs/wp-content/themes/ottomar-5/library/css/style.css
	htdocs/wp-content/themes/ottomar-5/library/js/widgets-ck.js
	htdocs/wp-content/themes/ottomar-5/library/js/widgets.js
	htdocs/wp-content/themes/ottomar-5/library/less/_base.less
	htdocs/wp-content/themes/ottomar-5/library/less/_mixins.less
	htdocs/wp-content/themes/ottomar-5/library/less/pages/splash.less
	htdocs/wp-content/themes/ottomar-5/page-slideshow-works.php