some shit
Merge branch 'development' into qa
working on report
added equipment task report
Merge branch 'qa' into development