foo
Defaults for "new window"
Merge branch 'master' of github.com:ljonsson/dot

Conflicts:
	.screenrc