Merge branch 'master' into test1

# Conflicts:
#	backend/index.ts

backend/index.ts

@@ -7,5 +7,6 @@ const app = express();
 app.use(cors());
 app.listen(PORT);
 
+console.log('dev changes');
 console.log('test1');
 console.log('Server running at port ', PORT);
\ No newline at end of file