Merge branch 'master' of github.com:azet/dotfiles

Conflicts:
	foreign/README.md
Merge branch 'master' of github.com:azet/dotfiles