green
Merge branch 'master' of github.com:stremann/common

Conflicts:
	global.css