Added FR 2.2, prereqs for estimates
Merge branch 'master' of https://github.com/kproj6/report