banking-101
Banking 101 More
Merge remote-tracking branch 'origin/master'

Conflicts:
	htdocs/css/carousel.css
	htdocs/css/six-block-menu.css
	htdocs/js/header.js
	htdocs/json/menu_items.json
	htdocs/pages/carousel.php
	htdocs/pages/six-block-menu.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	htdocs/css/carousel.css
	htdocs/css/six-block-menu.css
	htdocs/js/header.js
	htdocs/json/menu_items.json
	htdocs/pages/carousel.php
	htdocs/pages/six-block-menu.php
Hopefully fixed errors