.
Merge branch 'master' of github.com:iblis17/env-config

Conflicts:
	.screenrc