Amok
Merge branch 'master' of https://github.com/fbioliver/git-kurs