Add .screenrc to dotfiles
Merge branch 'master' of github.com:vdumoulin/dotfiles

Conflicts:
	.make.sh