-I forgot b.txt!!! Only thing I can change is the message :(
Merge branch 'master' of https://github.com/stratiot/test