Merge branch 'master' into qlearning

Author: truered8

README.md

@@ -0,0 +1,21 @@
+# traffic-control
+A traffic control system in Python using PyGame and OpenCV.
+
+# Setup
+First, ensure that you have git, Python, and pip installed.
+Then, install the dependencies:
+```
+pip install -r requirements.txt
+```
+
+# Usage
+```
+# allows user to select lanes
+python lane_select.py -p {path to image of intersection} -s {path to save new image}
+
+# runs vehicle detection example from https://github.com/andrewssobral/vehicle_detection_haarcascades
+python vehicle_detection.py
+
+# runs main simulation
+python simtest.py
+```

requirements.txt

@@ -35,3 +35,47 @@ tqdm==4.43.0
 urllib3==1.25.8
 Werkzeug==1.0.0
 wrapt==1.12.0
+=======
+absl-py==0.9.0
+astor==0.8.1
+cachetools==4.0.0
+certifi==2019.11.28
+chardet==3.0.4
+cycler==0.10.0
+gast==0.2.2
+google-auth==1.11.2
+google-auth-oauthlib==0.4.1
+google-pasta==0.1.8
+grpcio==1.27.2
+h5py==2.10.0
+idna==2.9
+Keras==2.3.1
+Keras-Applications==1.0.8
+Keras-Preprocessing==1.1.0
+kiwisolver==1.1.0
+Markdown==3.2.1
+matplotlib==3.2.0
+numpy==1.18.1
+oauthlib==3.1.0
+opencv-contrib-python==4.2.0.32
+opt-einsum==3.1.0
+protobuf==3.11.3
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pygame==1.9.6
+pyparsing==2.4.6
+python-dateutil==2.8.1
+PyYAML==5.3
+requests==2.23.0
+requests-oauthlib==1.3.0
+rsa==4.0
+scipy==1.4.1
+six==1.14.0
+tensorboard==1.15.0
+tensorflow==1.15.0
+tensorflow-estimator==1.15.1
+termcolor==1.1.0
+tqdm==4.43.0
+urllib3==1.25.8
+Werkzeug==1.0.0
+wrapt==1.12.0