Merging hw2 back into master