-making some changes to try and make the site more flexible and responsive
-removed '.container' from grid.css, moved and renamed to '.container_header', 'container_content', and 'container_footer'

-still a lot of work to be done to make it look right.
-template being used for responsive testing
-fixed flexible design for template_item_info
-added flexibility to template_basic
-added new rules for responsiveness to main.css
-adding credits.png for this branch
-changed button look and added a transition for box-shadow
-added a @media query for future screen with adjustments
-completely revamped navigation
-added template_responsive.html
-added new responsive navigation to both template_basic and template_item_info

Working on next:
-adding responsive nav to existing pages
-made changes to footer, cleaned it up and made some adjustments to padding
-added responsive features to contact_us.html from the testing_framework_products branch
-added resonsiveness to template_payment_info
-made some changes regarding the content layout and grid use
-removed @media width 800 for col-1of2
-added responsiveness to about_us.html
Updated all the bottom links to go to the websites of Sienar's partner companies.
Re-uploading all of my rendered product pictures for this website branch.
Added a copy of the product page to experiment on.
updated the structure of product 1 page. Will be splitting branch away to work on it in more detail while this branch is reintegrated into the main branch.
-added changes to navigation for all template pages
-made several adjustments in regards to fonts and headings
-fonts changed on template_responsive, still need to add google fonts code to other pages
-made adjustments to footer for files that did not have the updated footer menu.
Merge branch 'origin/makingFlexible'

Conflicts:
	_work/css/main.css
	_work/template_item_info.html
	_work/template_payment_info.html

-Attempted to resolve conflicts