first commit
Merge https://github.com/riberymmbaya/kim-pro