User edit
Merge branch 'master' of https://github.com/Mureithi/HCMP-1