mainStyles
Merge branch 'master' of https://github.com/rbergenl/vivanty

Conflicts:
	wp-content/themes/hexagonal-child/stylesheets/mainStyles.css