fused both packages
fused both packages
Merge branch 'master' of github.com:ethz-asl/FLIR_tools