made HTML better style-wise
adjusted CSS for 'better-looking' menu bar (still only temporary)
fixed potentially buggy text in menus
changed 'dropdown' menus to horizontal menu thing
added Jonathan's stuff
changed weird image sizes
main page overhaul: incorporated Bootstrap for mobile styling, added basic styling for medium screens, fixed and reorganized navbar, moved 'join our team' and 'open a store' links to footer, banner now rotates between three banner images, added basic info boxes in page content
Changed color of header/footer
Merge pull request #20 from torijule/Forms

Git garbage
changed color of header and footer
Merge branch 'ray' of https://github.com/torijule/INFO343Final into ray

Conflicts:
	css/main.css
	index.html
	js/menu.js
Merge branch 'master' into ray

Conflicts:
	bootstrap/css/bootstrap-theme.css.map
	bootstrap/css/bootstrap-theme.min.css
	bootstrap/css/bootstrap.min.css
	bootstrap/fonts/glyphicons-halflings-regular.eot
	bootstrap/fonts/glyphicons-halflings-regular.svg
	bootstrap/fonts/glyphicons-halflings-regular.ttf
	bootstrap/fonts/glyphicons-halflings-regular.woff
	bootstrap/js/bootstrap.min.js
	bootstrap/js/npm.js
	css/main.css
	img/banner-membership.jpg
	img/banner-membership.png
	img/banner-specials.jpg
	img/icons/facebook-icon.png
	img/icons/twitter-icon.png
	img/inner-bg.jpg
	img/logo_hor.png
	img/logo_hor2.png
	img/logo_trans.png
	index.html
	js/jquery-2.1.1.min.js
Merge branch 'ray'
Merge branch 'master' of https://github.com/torijule/INFO343Final
Change the color adn background
Fixed +edit  index and css

- FIx the garbage in html
- add css for mini screen
-fixed the search bar
fixed customer-care index, and changed index's css

- make the form fit into the body
- add image for index.html info box
add the gradient image for background
updated links to each page and main starting point
Merge branch 'master' into Jessica

Conflicts:
	css/main.css
	index.html