Merge branch 'master' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 17:45:28 +0000 (12:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 17:45:28 +0000 (12:45 -0500)
commit931ff2451d497787a15fcb309949361c8467fca8
treee0ca4f58b286206277a8a6fcdea475b1554f2e8d
parent400a9b20f1c753cf0f60bd923d41833d146c6328
parente076e225a293dd7977cee3fd657692645f5a2b6b
Merge branch 'master' into develop

Conflicts:
Gruntfile.js
css/app.css
front-page.php
functions.php
js/app.js
scss/_structure.scss
Gruntfile.js
css/app.css
front-page.php
functions.php
scss/_structure.scss