first commit
Merge github.com:ostrowr/cs184-hw3