Merge pull request #1 from MarlboroCollegeComputerScience/master

sync repo
Merge pull request #4 from jimmahoney/master

Merge pull request #1 from MarlboroCollegeComputerScience/master