resizing items
fixed merge conflict
Merge branch 'master' of https://github.com/shashashasha/gifbot
Merge branch 'master' of https://github.com/shashashasha/gifbot
merging css file