mvp
Merge branch 'master' of https://github.com/Coedcoe/coexistmedia

Conflicts:
	app/views/landing/index.haml
mvp