class consolidation
Merge branch 'master' of https://github.com/justinleewells/JPMCodeForGood
class consolidation