Project 2 Pull Request

@jstaahl

Both issues that I've proposed have been completed. Please take a look.

~requested: 450