update
Merge branch 'master' of github.com:m19cmjigen/dotfiles

Conflicts:
	.profile
update merge master