adding all the functionality for the rolling average and rolling ratio in rwanalysis.py
fixing conflicts for the rolling analysis