ahhh editing/create events work
Merge branch 'master' of github.com:dsyang/cmunications
manual merge
all tests pass, code works on website too