first commit
Merge branch 'master' of https://github.com/Eric-Jr/khi-redesign
Merging with version 1.0.0