Merge pull request #6 from jeremymills/develop

Upload Changes
Merge branch 'develop' of https://github.com/jeremymills/Phar-Project2
Merge branch 'master' of github.com:mis8680/Phar-Project2
.