//Merge remote-tracking branch 'origin/master'
//Conflicts:
//	wp-content/themes/twentythirteen-child/functions.php

Responsive layout