first commit
Merge branch 'master' of https://github.com/rnicolas/arduino

git rebase --continue
Trying to understand how it works