final version
Merge branch 'master' of https://github.com/cagrizaman/Senseable_IR

Conflicts:
	IRDishControl/main.cpp