from henrikbjorn/flint to flint/flint
Merge branch 'master' of github.com:henrikbjorn/Flint