Lab07branch Pull Request

@jstaahl

Lab07 has been completed. Please take a look.

~requested: 200