Merged Step and Commit
Reworked dj_database_url, made migrations