stopping point
stuff
Merge branch 'develop' into feature/framecalc
using session framework instead of urls
moved vars into session framework
created decorators file
session framework and decorators work
Merge branch 'feature/framecalc' into develop