export java_home by command
Merge branch 'master' of github.com:littleboy85/init

Conflicts:
	bashrc_mac