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

Conflicts:
	resources/rcfiles/zshrc
add r lang package for atom