Fixed stuff with webcam
Merge branch 'master' of https://github.com/X-reX/Achtung

Conflicts:
	achtung.py
	flags.py