going to pull latest
fixed merge conflict
merging in latest, which i believe is patrick's work
Merge branch 'master' of https://github.com/isaiahmathieu/pocketpickup
adding a test project becuase I think thats the way to go
re added test project