untest
Merge branch 'master' of github.com:tkriik/etherchat-master
untest