Added new boilerplate for cals IT ACS Parent theme
Made new style adjustments based on the boilerplate start
Gave the homepage a template name
Updated home page header styles
Making div.homePageFeature display only when is_front_page() ==true
Updated the gulp sass plugin with new options so that it errors gracefully.
Merge branch 'flatdesign' of https://github.com/uwmadisoncals/calsmain-calsACS-IT into flatdesign
_colors.scss: adding new color variables
_page.scss: this new sass file contains sass code related to page.php
content-page.php: (temporarily) hardcoding a breadcrumb feature into the page
master.scss: adding the newly created _page.scss so it is included in master.scss
page.php: removing the comments from static pages; commenting out get_sidebar until I figure out if we want side-bar templates
page-home.php: commenting out get_sidebar()
Merge branch 'flatdesign' of github.com:uwmadisoncals/calsmain-calsACS-IT into flatdesign

Conflicts:
	dist/styles/unminified/master.css
	package.json

NOTE: I had chosen 'resolve using theirs', because master.css is expected to be different, and it will be recompiled when running gulp anyways. In package.json, my changes were not important, I accidentally ran 'npm install' which updated the version of live-reload, but the former version is fine.
Added more content and styling to homepage
Merge branch 'flatdesign' of https://github.com/uwmadisoncals/calsmain-calsACS-IT into flatdesign

Conflicts:
	dist/styles/minified/master.min.css
	page-home.php
Updated page styles with bread crumb and header tweaks.
_page.scss: added @media queries for mobile responsive layouts, altering the stylings of the page heading
_fonts.scss: adding new font weight
_colors.scss: new color variable used by the header on _page.scss
Added bower components and updated styles for menu
Merge branch 'flatdesign' of https://github.com/uwmadisoncals/calsmain-calsACS-IT into flatdesign

Conflicts:
	dist/styles/minified/master.min.css
adding footer.php, adding markup

create new sass file for the footer, include some styles with it

including the @import in master.scss sincee I made a new sass file for footer
Updated menu style and animation
Merge branch 'flatdesign' of https://github.com/uwmadisoncals/calsmain-calsACS-IT into flatdesign

Conflicts:
	dist/scripts/main.js
	dist/scripts/main.min.js
	dist/styles/minified/master.min.css
Updated menu to support nested items
styling on footer.scss
adding markup in the footer.php