reporting
gitignore correction
gitignore correction
admin controller redone
tryn to fix edit conflict 1
resolved conflicts
created controller for settings and report. renamed some files