assignment 4 resub due to wrong pull request
Merge remote-tracking branch 'upstream/master'
modified to be user name
delete wrong files
add files
fix merge
add files
Merge pull request #48 from lw1582/master

this is the right one!