revert to my things
Merge branch 'master' of https://github.com/florians/baka