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

Conflicts:
	bash_history
update gitignore