se modificó el .lock
Merge branch 'master' of github.com:semrh/ChatSyTW