making changes
Merge branch 'ui-ux' of https://github.com/ChelseaSchool/IEP-IPP into ui-ux