added zeus, run zeus start to speed up your tests
controller generated
Merge branch 'master' into develop
merge develop into exchange_controller
exchange model
Merge branch 'develop' into landing-page

Conflicts:
	config/routes.rb