this is more difficult than it should be
Merge branch 'master' of https://github.com/eyestreet/test2