updating rolling window analysis
Merge branch 'activedev' of https://github.com/WheatonCS/Lexos into activedev

Conflicts:
	models/ModelClasses.py