changed user#show to not have a table, now it just lists out your events in detail
Merge branch 'mike'