Changed settings for test
Merge branch 'master' of https://github.com/johnshiver/PickUpMyStuff
made test change to settings