text
text
Merge branch 'gh-pages' of https://github.com/jimmyn/webshop into rails
Merging changes.