login error message
dummy merge commit
error message for joining groups
fixed merge conflict
Merge branch 'master' of github.com:Brennan-M/ExpenShare