finish project2
Merge branch 'master' of https://github.com/interloper1138/javascript_projects