removed the code releated to hw1
merged code from hw1 and solved the conflicts.
changed the code