Merge fixes

Author: qubitron

.gitignore

@@ -1,5 +1,9 @@
 # python
 __pycache__/
+env
+venv
+.env
+.venv
 
 # local db
 db.sqlite3
@@ -24,3 +28,6 @@ build/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# VS Code
+.vscode

.vscode/settings.json

@@ -28,12 +28,18 @@ py -3 -m venv env
 env\scripts\activate
 ```
 
-3. Install requirements.txt
+In Powershell
+```Powershell
+py -3 -m venv env
+env\scripts\activate
+```
+
+2. Install requirements.txt
 ```bash
 pip install -r requirements.txt
 ```
 
-4. Import the project folder into VS Code
+3. Import the project folder into VS Code
 ```bash
 code .
 ```

README.md

@@ -1,4 +1,4 @@
 flask_migrate==2.3.0
 flask_script==2.0.6
 psycopg2==2.7.5
-flask_bcrypt==0.7.1
+flask_bcrypt==0.7.1