Merge branch 'develop' of cvs2:WP-Themes/ChippewaCounty into develop

diff --cc Gruntfile.js
index 8da6324,753734c..753734c
mode 100644,100755..100644
--- 1/Gruntfile.js
--- 2/Gruntfile.js
+++ b/Gruntfile.js

diff --cc css/app.css
index 2313984,2228900..2228900
mode 100644,100755..100644
--- 1/css/app.css
--- 2/css/app.css
+++ b/css/app.css

diff --cc footer.php
index 6f88f37,c1b01eb..c1b01eb
mode 100644,100755..100644
--- 1/footer.php
--- 2/footer.php
+++ b/footer.php

diff --cc front-page.php
index 99c0a27,844d0d3..844d0d3
mode 100644,100755..100644
--- 1/front-page.php
--- 2/front-page.php
+++ b/front-page.php

diff --cc functions.php
index 10a3e99,a31fc56..a31fc56
mode 100644,100755..100644
--- 1/functions.php
--- 2/functions.php
+++ b/functions.php

diff --cc header.php
index 95af893,9619f61..9619f61
mode 100644,100755..100644
--- 1/header.php
--- 2/header.php
+++ b/header.php

diff --cc index.html
index c12f4e0,f56fbb3..f56fbb3
mode 100644,100755..100644
--- 1/index.html
--- 2/index.html
+++ b/index.html

diff --cc index.php
index 299b0bf,aeda129..aeda129
mode 100644,100755..100644
--- 1/index.php
--- 2/index.php
+++ b/index.php

diff --cc js/app.js
index c3c8817,8422bff..8422bff
mode 100644,100755..100644
--- 1/js/app.js
--- 2/js/app.js
+++ b/js/app.js

diff --cc package.json
index 453d7ea,bdb87da..bdb87da
mode 100644,100755..100644
--- 1/package.json
--- 2/package.json
+++ b/package.json

diff --cc page.php
index 849ff5a,07ddac7..07ddac7
mode 100644,100755..100644
--- 1/page.php
--- 2/page.php
+++ b/page.php

diff --cc scss/_settings.scss
index 5c15ce5,8a43025..8a43025
mode 100644,100755..100644
--- 1/scss/_settings.scss
--- 2/scss/_settings.scss
+++ b/scss/_settings.scss

diff --cc scss/_structure.scss
index b2c13da,d0ebaf6..d0ebaf6
mode 100644,100755..100644
--- 1/scss/_structure.scss
--- 2/scss/_structure.scss
+++ b/scss/_structure.scss