pre-masonry
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/colored-top-menu/page-about.php
	wp-content/themes/colored-top-menu/style.scss
pre-masonry