Project 2 classes
Merge pull request #4 from nicklondhe/master

Project 2 classes