Added JAVA_HOME
Merge branch 'master' of https://github.com/NickCody/dotfiles

Conflicts:
	dotbashrc