more work on edit activity.
Merge branch 'master' of https://github.com/AlvinYuan/cs160