first commit
Merge branch 'master' of github.com:Rifu/momotoro

In which I mess up my first commit