#4 Why I hate to rebase
disclaimer
Merge branch 'master' of github.com:Baptouuuu/blog