Joining MOST things
Merge branch 'master' of github.com:Maikon/rebase