stuff i made before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/twentythirteen-child/style.css
	wp-content/themes/twentythirteen-child/style.scss
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
silocoffee