Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/medienverarbeitung17.projectmood.iml
#	.idea/misc.xml
#	projectmood/main.py

.gitignore

 # Benutzerspezifisch
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-*.iws
-out/
-/venv
-
-**/logs
+.idea/**

.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/medienverarbeitung17.projectmood.iml" filepath="$PROJECT_DIR$/.idea/medienverarbeitung17.projectmood.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

.idea/preferred-vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PreferredVcsStorage">
-    <preferredVcsName>ApexVCS</preferredVcsName>
-  </component>
-</project>
\ No newline at end of file

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

projectmood/main.py

 import cv2
-import numpy
+
\ No newline at end of file
+cap = cv2.VideoCapture(0)
+
+while(True):
+    # Capture frame-by-frame
+    ret, frame = cap.read()
+
+    # Our operations on the frame come here
+    gray = cv2.cvtColor(frame, cv2.COLOR_BGR2GRAY)
+
+    # Display the resulting frame
+    cv2.imshow('frame',gray)
+    if cv2.waitKey(1) & 0xFF == ord('q'):
+        break
+
+# When everything done, release the capture
+cap.release()
+cv2.destroyAllWindows()
\ No newline at end of file

requirements.txt

-appnope==0.1.0
-bleach==2.1.1
 cycler==0.10.0
-decorator==4.1.2
-entrypoints==0.2.3
-html5lib==1.0b10
-ipykernel==4.6.1
-ipython==6.2.1
-ipython-genutils==0.2.0
-ipywidgets==7.0.3
-jedi==0.11.0
-Jinja2==2.9.6
-jsonschema==2.6.0
-jupyter==1.0.0
-jupyter-client==5.1.0
-jupyter-console==5.2.0
-jupyter-core==4.3.0
-MarkupSafe==1.0
 matplotlib==2.1.0
-mistune==0.7.4
-nbconvert==5.3.1
-nbformat==4.4.0
-notebook==5.2.0
 numpy==1.13.3
 opencv-python==3.3.0.10
-pandocfilters==1.4.2
-parso==0.1.0
-pexpect==4.2.1
-pickleshare==0.7.4
-prompt-toolkit==1.0.15
-ptyprocess==0.5.2
-Pygments==2.2.0
 pyparsing==2.2.0
 python-dateutil==2.6.1
 pytz==2017.2
-pyzmq==16.0.2
-qtconsole==4.3.1
-simplegeneric==0.8.1
 six==1.11.0
-terminado==0.6
-testpath==0.3.1
-tornado==4.5.2
-traitlets==4.3.2
-wcwidth==0.1.7
-webencodings==0.5.1
-widgetsnbextension==3.0.6
+tblib==1.3.2
+virtualenv==15.1.0

setup.py

-from setuptools import setup, find_packages
-import io
+from setuptools import setup
 
 with open("README.rst") as f:
     long_description = f.read()
@@ -12,10 +11,6 @@ setup(
     author='tjadoihmels',
     author_email='tjado.ihmels@uni-oldenburg.de',
     long_description=long_description,
-    install_requires=[
-        'opencv-python',
-        'numpy',
-        'matplotlib', ],
     platforms='any',
     description='Christina Tsiroglou, Arne Gerdes, Tjado Ihmels',
 )