Small changed
Merge branch 'master' of github.com:shuge/lees_config

Conflicts:
	bash_profile.sh
	bash_profile_ubuntu.sh