updated from last file
fixed the assoication between users and events. Joining events works
fix duplicate css in styles to resolve conflict
Merge branch 'events'

conflict resolution on styles.css -- removed duplicate entry