screen resume for mm
Merge branch 'master' of https://github.com/m4rkw/env

Conflicts:
	dotfiles/.bash-mac