finished hw3
pushing to master