Fix conflict of .gitignore
Revert "Remove MEDIA_ROOT on settings.py"

This reverts commit 0b7dbe592ab1377a4e2e52a282ec5aa98c793a7a.
Modify thumbnail storage path