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

Conflicts:
	css/app.css
	css/app.css.map

diff --cc css/app.css
index b0dd331,a2ab1a7..07683d9
--- 1/css/app.css
--- 2/css/app.css
+++ b/css/app.css
@@@ -7682,4 -7709,4 +7713,4 @@@ input.button 
        display: block; }
  
  /* End Mobile Menu */
--/*# sourceMappingURL=app.css.map */
++/*# sourceMappingURL=app.css.map */

diff --cc scss/_blog.scss
Simple merge