Refactor some conditional
Redefine report table
Refactor some conditional
Redefine report table
Merge remote-tracking branch 'origin/master'
Forgot to edit model
Merge pull request #16 from rolies106/master

Redefine report table