update
Merge branch 'master' of github.com:GeminiQM/home.conf

Conflicts:
	bashrc
	setup.sh