Finished the employee index page
resovled conflicts
design tweaks

consolidating some components, tweaking design on some pages
more design tweaks
fix space
creating audience page styles
"more" responsive modal with links
no save button, fix columns
more columns work

This will need more work, doesn't split into two columns at tablet
width. I added it to the readme for someone else to do later.
Merge branch 'generator-changes' into audience-page

Conflicts:
	assets/css/admin-home.min.css
	assets/css/college-dept-home.min.css
	assets/css/content.min.css
	assets/css/employee-info.min.css
	assets/css/global.min.css
	assets/css/homepage.min.css
	assets/css/news-detail.min.css
	assets/css/news-front.min.css
	assets/css/news-index.min.css
	assets/css/search.min.css
	assets/css/services.min.css
	pages/news-index/news-index.less
	pages/services/services.less
sync css
Merge pull request #45 from BYUI-Web/audience-page

Audience page, Design Tweaks
css output change
Merge branch 'generator-changes' of https://github.com/BYUI-Web/responsive-prototype into generator-changes

Conflicts:
	assets/css/global.min.css
	assets/css/homepage.min.css
	assets/css/news-front.min.css
hide mockup page

page isn't working at the moment
update readme
Fixed markup and less for employee index to match the other page types.  Also fixed grunt file to watch layouts.  Fixed Layout.html to include local jquery instance and if that doesn't load then to load the one from google.  This way we have less reliances on other servers uptime
Merged generator-changes
Merge pull request #43 from BYUI-Web/employee-index

Finished the employee index page
Merged generator-changes