merge Merge branch 'master' of https://github.com/umddb/datascience-fall14
remoteMerge branch 'master' of https://github.com/kunals1994/datascience-fall14
updates