modified gemfile
fixed merge
Merge branch 'Listing' of https://github.com/StephanMusgrave/ProjectX
progressing with editing a listing
almost done with editing a listing