initial state :P
Merge branch 'master' of https://github.com/nickzorb/the_blond-s_shop.git