Contact Page
start contact page
Merge branch 'master' of https://github.com/lukexwinter/bluestone-web

Conflicts:
	css/main.css
Merge commit
Contact Page / Video Home Updates
Merge branch 'master' into luke-dev

Conflicts:
	css/main.css
8-14-2014 commit
Added Pages

- Cincy Growing Cincy
- AMIG
- Work Page Update
- Added Amalfi Copy
Merge branch 'andy-dev'

Conflicts:
	.sass-cache/59bd27b84958e2a83af50e93ddc85eaecb211b3e/main.scssc
Added Sterling

- Updated copy
Resolved
bad commit /merge
Revert a9ebbe9..25bad80

This rolls back to commit a9ebbe9b5459e3d59b729b8d69c41027a44dfd24.
Merge branch 'luke-dev'

Conflicts:
css/main.css
bad commit / merge
Revert a9ebbe9..363e60b

This rolls back to commit a9ebbe9b5459e3d59b729b8d69c41027a44dfd24.
Fix Bad Commit
Merge branch 'luke-dev'

Conflicts:
	css/main.css
Most Recent October Update
Merge branch 'master' into andy-dev