added end conversation on login - not working yet
Merge branch 'master' of github.com:jcalvinowens/keychat