gallery plugin injected
Merge remote-tracking branch 'origin/master'
standard layout topbar vertical
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/twentythirteen-child/functions.php