Initial commit
Merge branch 'master' of github.com:ldematte/melchior