updating stuff
Merge branch 'master' of https://github.com/IDMNYU/DM2193FA2014