.idea file removed
resolve conflicts
changes is user role
new migrations added
new migrations added
take apurva's code
working on notice and events
working on notice and events
working on notice and events
changes in database.yml
notice controller removed
resolve conflicts
blank commit
notice
modified gitignore file
event controller and model
working on event html
working on event html
working on event show
working on event show