initial consolidation of two .js
Merge branch 'master' of https://github.com/dcorwin/15237-project1
Merge branch 'master' of https://github.com/dcorwin/15237-project1