Merge after conflict resolution
Merge branch 'master' of github.com:kcl-ddh/digipal