Merge pull request #1 from MarlboroCollegeComputerScience/master

Syncing
Merge pull request #3 from CorySpitzer/master

Merge pull request #3 from MarlboroCollegeComputerScience/master