revert to where CPT works again
Merge branch 'master' of https://github.com/cl565/web-dev-final-project

Conflicts:
	wordpress/wp-content/plugins/Lamontagne-Winbars.php