before merge
Merge branch 'master' of github.com:TKNGUE/dotfiles

Conflicts:
	.gitignore
	.zshrc
	configure.sh
Merge branch 'master' of github.com:TKNGUE/dotfiles
Merge branch 'master' of github.com:TKNGUE/dotfiles
Merge branch 'master' of github.com:TKNGUE/dotfiles

Conflicts:
	.vimrc