Merge branch 'master' of github.com:garaemon/garaemon-settings
update
Merge branch 'master' of github.com:garaemon/garaemon-settings

Conflicts:
	resources/rcfiles/zshrc