style.css
 page-inspiration.php
 header.php
 page-photo.php
 page-art-studio.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/blankslate/css/style.css
	wp-content/themes/blankslate/header.php
	wp-content/themes/blankslate/page-art-studio.php
	wp-content/themes/blankslate/page-inspiration.php
	wp-content/themes/blankslate/page-photo.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/blankslate/page-art-studio.php
	wp-content/themes/blankslate/page-inspiration.php
Merge remote-tracking branch 'origin/master'
style.css
 page-inspiration.php
 header.php
 page-photo.php
 page-art-studio.php
Merge remote-tracking branch 'origin/master'
style.css
 page-inspiration.php
 header.php
 page-photo.php
 page-art-studio.php
change style