commiting to barak-hw3
Fixing hw1
Merge branch 'barak-hw3'