week 1-2
Merge branch 'master' of https://github.com/hamiltondanielb/M101JS