init github branch
Merge branch 'master' of github.com:jochenklar/daiquiri into github