Fix merge
Merge branch 'config' of github.com:tkriik/etherchat into config