merge
rails_12factor gem
pixabay api call for images
seed file created
changed pixabay pictures
updated csv file
Merge branch 'images-api' into development
Merge branch 'development' of https://github.com/MeetElizabeth/Team-Actual-Advice-Mallard into development

Conflicts:
	p2-app/Gemfile
	p2-app/Gemfile.lock