modify stuff
Merge branch 'devel' of github.com:tkriik/etherchat into devel