Submitting for today
Merge branch 'master' of https://github.com/stefanhar/theKamiProject