stuff!
Merge branch 'gh-pages' of http://github.com/sinak/shopornot into gh-pages

Conflicts:
	russell/static/css/main.css
Merge fix