Merge pull request #5 from bjurgess1/hw5

Hw5
Merge pull request #6 from bjurgess1/hw6

Hw6
Finish homework 7
Updating the changelog
Fixing some issues with loading