fixed merging bug
Merge branch 'master' of https://github.com/tanvirt/Faculty-Activity-Report