almost done with login and join
fixed merge
fully log in capable
Merge branch 'master' of https://github.com/cameronmccord2/cs340