committing to pull, no real change done
fixing merge conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Fixed merging conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Passwords fixed
Added carousel for listing view
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Minor correction
Minor correction
Corrected first image upload for new listing
heroku update prep
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
hashtag naming changed
Minor changes
Show "add another picture" button for extra two fields
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
added some images for testing