commit
Merge branch 'master' of https://github.com/maikop/LemmingsEffect

Conflicts:
	uudisreader/static/css/stylesheet.css
Merge branch 'master' of https://github.com/maikop/LemmingsEffect