added toggle for lines and circles
Merge branch 'master' of github.com:ShaneBurkhart/LivePoolAid

* 'master' of github.com:ShaneBurkhart/LivePoolAid:
  Gui implemented
  asdf

Conflicts:
	VideoCapture.py