Merge pull request #199 from jcampbe6/master

Project 2