Took out conflict message.
Updated the gitignore to include prod_settings.py
Updated PIL requirement to Pillow.
Added the ability to switch from dark to light colour template.
Sorl-thumbnail works properly and is rendering the images on the browser.
Image for the carousel slide image gallery is now rendering an image and it is different from the cover image.
No changes were made.
Change in the way image gallery calls an image.
Nothing was changed.
Fixing merge conflict.