Added from SG
Merge branch 'master' of github.com:groetzingrolf/gotterdammerung
Merge branch 'master' of github.com:groetzingrolf/gotterdammerung

Conflicts:
	static/css/style.css