Starting to integrate ar
Merge branch 'gkahn_branch' into anna2
first draft of ar integration
changes to make it run on anna's computer
env change
AR fixes
Merge branch 'master' into anna2

Conflicts:
	joint_states_listener/joint_states_listener.py
	scripts/ArmControl.py
	scripts/CommandGripper.py
	scripts/ImageDetection.py
	scripts/Master.py
bug fix
ar integration working
Merge branch 'anna2'