Ignore idea folder
REsolved merge conflicts
Fixes for django deployment so this repo works out of hte box again.