init
Merge branch 'master' of https://github.com/Ekito/hamelin-android