merged
Merge branch 'master' of https://github.com/rrusle/twitter
merged task
checking