fix
changed views to show my events, added to controller
fixed merge conflicts
fixed merge conflicts