fixed error
.
.
.
Merge branch 'master' of https://github.com/umddb/datascience-fall14
final sub