Updates GNU screen scrollback to 1 million lines
Merge branch 'master' of github.com:shantanusharma/Linux-environment

Conflicts:
	.screenrc