End of week commit
Merge branch 'master' of https://github.com/creativebeans/khulab.git