Removed merge symbols in main.cpp
Merge branch 'module/torqueBalancing' of github.com:robotology/codyco into module/torqueBalancing