landing
Merge branch 'expeditions' of https://github.com/belafontestudio/equinoxe-website into expeditions

Conflicts:
	app/styles/application.styl
Merge branch 'expeditions' of https://github.com/belafontestudio/equinoxe-website into expeditions

Conflicts:
	app/styles/application.styl