cs
random
lab
cs+lab

Conflicts:
	.bashrc
	.screenrc
	.vimrc
all merge

Conflicts:
	.bashrc
	.screenrc
	.vimrc