modified:   oh-my-zsh (untracked content)
	added some new dotfiles for hg, etc..
Merge branch 'master' of github.com:ReneMuhl/dotfiles

Conflicts:
	.alias
	.zshrc

	modified:   .alias
	modified:   .zshrc