new crap on master branch
Merge branch 'master' of https://github.com/martinwguy/foo
second branch