Rich D: lab1, no bonus points yet
Rich D: lab1, refactory
Merge branch 'intro-js' of github.com:rdammkoehler/codemashlore into intro-js