Update assignment1.txt
fixed merge
add branch from master 1