added some shit - sina style commit message
Merge branch 'gh-pages' of https://github.com/sinak/shopornot into gh-pages