.
.
Merge branch 'master' of github.com:umddb/datascience-fall14
Merge remote-tracking branch 'upstream/master'