Merge branch 'majorika-master'
Merge branch 'master' of github.com:teampopong/crawlers