gitmodules
merge from dev
Merge branch 'gh-pages' of https://github.com/fex-team/kityminder into gh-pages