assign1 last edits
assign2
Merge branch 'master' of https://github.com/samuelshih/modernjs_cis114