Update for assignment 7

Includes all assignment 7 files as well as assignment 6b.