merge conflicts
Merge branch 'master' of github.com:Sovietaced/Morgan-Stanley-Hackathon