added guardfile
added zeus, run zeus start to speed up your tests
Merge branch 'master' into develop
merge develop into exchange_controller
exchange model