Merge branch 'master' into Front-End
Projects Layout and Styling
Merge branch 'master' into Front-End

Conflicts:
	wp-content/themes/work-shop/archive-projects.php
Projects Layout
Projects Layout
Even and Odd
Merge branch 'Front-End'