commiting what I have
Merge branch 'master' of https://github.com/rasel160/Chi