CSS stuff
Merge branch 'master' of https://github.com/ton03/kasia

Conflicts:
	public/stylesheets/main.css