fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	SystemConf.markdown
	gnome.txt