faq conflict
Aliva Changes

Got changes to the FAQ that Aliva added, began reformatting for the new styling.
Aliva Changes

Got changes to the FAQ that Aliva added, began reformatting for the new
styling.
Faq Function and Design

added some design and function changes to the FAQ section, including category, detail, and search.
Detail FAQ Changes

Changed the faq detail to show to the title as the question, and include the search bar for easy accessibility.
FAQ tag changes

minor changes to the FAQ so that styles would show up properly
beginning of printshop quote styling

started setting up the styling for the printshop
Merge remote-tracking branch 'origin/FAQ' into CPTheme

Conflicts:
	Views/Shared/_FAQColumnsTwo.cshtml