Init commit
Merge branch 'master' of https://github.com/Illyen/samen.git