some changes
Merge branch 'master' of https://github.com/imAlan/NYU-Emerging-Solutions