* Resolve conflict
* Change comments and add error column to output DataFrame
* Change file structure
* Update
* Modified diagnostics
* Update diagnostics.py following the advice on Github
* Add tests and documentation
* Change copy method into Prophet class and reflect comments