Added visual tracking window

You can see what the camera's doing! Yay
Visual tracking update

Weird conflict resolution with AC's code
Merge branch 'master' of https://github.com/zsherin/maslab-2014