weiwei 20140613
Merge branch 'master' of https://github.com/lge88/UCSD_BigData