added logout functionality
Merge branch 'master' of https://github.com/christineoen/WorkoutBuddies
add event functionality
fixed merge conflicts