clean up trash
Merge branch 'master' of github.com:alexebird/echat