still working on create activity
Merge branch 'master' of https://github.com/kfreedland/CS169GAP
merging
Merge branch 'master' of https://github.com/kfreedland/CS169GAP
changed naming convention