Merged conflicts
Time Series prediction code
Future Prices are working