Final commit of rules and modifications to test plan.
Merge branch 'master' of https://github.com/ui-cs383/SSRS