Turning in assignments #6 & #7

@cjbrambo if you run this, you'll see there is an error at the end. Might be due to the merge you just had to resolve.