added events to user show page
merge conflicts fixed
conflict resolved
columns edited