modified:   jshintrc
new file:   my.cnf
new file:   mysql.grcat
modified:   zsh/aliases.zsh
modified:   zsh/functions.zsh
modified:   zsh/variables.zsh
Merge branch 'master' of github.com:horosgrisa/dotfiles

Conflicts:
	zsh/aliases.zsh

modified:   .gitignore
deleted:    zsh/aliases.zsh
new file:   zsh/aliases.zsh