.bashrcにscreenコマンド追加
Merge branch 'master' of github.com:wknar/dotfiles

Conflicts:
	.bashrc