Began work on back end for reports
Added constants for clarity in application controller
fixed merge conflicts
Almost got summary working
Fixed merge conflict
Merge branch 'reports'