ignore non-code files
Merge branch 'master' of github.com:hqmq/dotfiles

Conflicts:
	vim/vimrc.symlink