Update based on resolved conflicts with a couple of files
Merge branch 'master' of https://github.com/ScriptXKE/AHIS.git