update yaml file
add modelaggregator
resolve conflicts
add modelaggregator
Merge branch 'gaussian_fit' of github.com:licode/VTTools into gaussian_fit
Merge pull request #28 from licode/gaussian_fit

Model Sum and Model Aggregator
MNT: Local merge due to conflicts