Update
Merge branch 'master' of github.com:graudeejs/dot.files

Conflicts:
	dot.shrc