tentative merge commit
add join button for two events
Merge branch 'jason_branch' into lyman_branch
add cookie persistant storage
resolve merge conflicts
Merge branch 'jason_branch' into lyman_branch
add class attendee
resolve conflict about Comment.m
make changes to model
merge conflict with Lyman