added gdiff(git diff) alias
Merge branch 'master' of github.com:shuge/lees_config
Merge branch 'master' of github.com:shuge/lees_config
append android SDK root into path
Added git-up alias
Merge branch 'master' of github.com:shuge/lees_config

Conflicts:
	bash_profile.sh