custom post type
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/bootstrap/functions.php
custom post type test