marge test
Merge branch 'master' of github.com:kohi3/inifiles

Conflicts:
	.bashrc