Merge remote-tracking branch 'upstream/master'

Making sure latest code up to date from Dr. Freund
Merge branch 'master' of github.com:huangger/UCSD_BigData
HW1Version1