conflict
Conflict corrected
Merge branch 'master' of github.com:regisely/TimeSeriesInR