editActivity done
Merge branch 'master' of github.com:barneyyy844/SummerSchoolWebDevelopment