Error fixing in progress.
Merge branch 'master' of https://github.com/iwanfrancis/group-13