changes
merge conflicts and stylesheet
Merge branch 'master' into join_on_invite
user can join if not already a member
Merge pull request #35 from jsimon727/join_on_invite

Join on invite
fixed merge conflict