java files
Merge branch 'master' of github.com:MehrCurry/dotfiles

Conflicts:
	.bashrc.load
set evironment variables