Merge pull request #1 from sfhatcompany/develop

v0.2 Upate fork repository
FAQ accordion added to faq.html
Merge branch 'ft-faq' into develop
Merge pull request #17 from jordanwink201/develop

Merge pull request #1 from sfhatcompany/develop
updated navigation menu w/o active class
basic bootstrap HTML and grid layout

Not sure if this will be added to the Riverz website or not
small changes to spacing of code
Merge branch 'ft-otherLines' into develop
sass file structure edited
Added shopping cart and changed to container

changed container-fluid, should been container
Merge branch 'ft-header' into develop

Conflicts:
	_includes/header.html
	_site/about.html
	_site/contact.html
	_site/help.html
	_site/index.html
Sizing Chart Modal Added

Needs to be configured and content added
Fixed conflicts
Removed footer script tags to fix bootstrap javascript, and put tooltip init functions into jquery onLoad function
CSS styles added to img-Carousel module
img_carousel sass files
Merge branch 'develop' of https://github.com/sfhatcompany/riverz-development into develop
bug solved, JS file order changed
need to re-size the images or change background
Styles added to topbar and navbar

Navbar still doesn’t show the background pattern