commit_2

updates to projects pages, front end layout with blade templates
commit_3

updates to hover boxes on home and projects pages, updates to grid box
height on home page
commit_5

edits to project_motion template
commit_6

enabling color changes to project titles from front-end
Merge branch 'nico-hen' of github.com:rafegoldberg/ACA-WP-Theme into nico-hen

Conflicts:
	.bladecache/04391c11e044a05db08025898cb1525d
	.bladecache/7d24cc0554455bccf4adcf87c1bbaed5
	.bladecache/ad7fcf83546b790d39b1d6d4c3287b23
	.bladecache/bebd28000cd2ff6d0abe439c07383e02
	.bladecache/c47cc085abdde44d886bd2a8934e5c9f
	.sass-cache/09b4a6a3ceea85fd1686c011c41c9c45d12fc47f/_wp-theme.scssc
	.sass-cache/4960c8dce53b2d07723cb693516fe560abbc5b45/_thirds-grid.scssc
	config.codekit
	front-page.php
	layouts/master.php
	lib/styles/_wp-theme.scss
	lib/styles/modules/_menu.scss
	lib/styles/modules/_thirds-grid.scss
	page.php
	partials/header.php
	partials/project-motion.php
	partials/project-still.php
	partials/sidebar.php
	project.php
	single-projects.php
	style.css
Resolving merge conflicts btwn nico-rafe and -hen
reverting 'all work' to garrett's original version
Merge pull request #2 from rafegoldberg/nico-hen

Nico hen