solve merge conficts in readme

.gitignore

@@ -9,6 +9,9 @@
 # environment variables
 .env
 
+# virtual env
+venv/
+
 # Migrations
 **/migrations
 

README.md

@@ -14,16 +14,16 @@ This README aims to document functionality of backend as well as required steps
 - Create file `.env` from `example.env` and populate fields correctly
 
 From inside the project's folder:
+
 - Make migrations:
+
 ```
 python manage.py makemigrations core geo companies products history stats
 python migrate
 ```
-- Start server in development mode: `python manage.py runserver`
 
+- Start server in development mode: `python manage.py runserver`
 
 ## Location data
 
 To load initial location data use: `python manage.py addgeo`
-
-