some commit
Merge branch 'master' into HEAD

Conflicts:
	.vimrc
	ntb/.xinitrc
some commit: