Added workshop custom post type
Merge branch 'master' of https://github.com/coompany/reactivicity-site

Conflicts:
	content/themes/reactivicity-theme/library/custom-post-type.php