added id field to model
ignore gen
incomplete work on create/edit activity
Merge branch 'master' of https://github.com/AlvinYuan/cs160
remove gen files from repo. will be ignored for future use