Commit current edits to April_Edits branch for local editing.
Testing commit to local April_Edits branch.
Update to product page elements and added search bar.
Made changes to workshop.html page and grid1.css. Soon-to-be interactive calendar.
Made edits to products.html and productdetails.html. Link hover now working! YAY! Also made changes to footer nav. Works across all pages.
Made changes to blog.html and grid1.css.
Merged to Master
Merge branch 'origin/master'

Conflicts:
	CombinedCode_2014-02-24/_work/CSS/style.css