zsh - Setting up AWS RDS CLI (needs JAVA_HOME)
Merge branch 'master' of ssh://github.com/niklasae/dotfiles

Conflicts:
	zshrc