Added infromation of requester and accepter and admin for each person with requests.
Fixed merge conflict.
Merge branch 'master' of github.com:Babakadam121/shift_management_system into erwin_requests
Merge branch 'master' of github.com:Babakadam121/shift_management_system into erwin_requests
Merge branch 'erwin_requests' of github.com:Babakadam121/shift_management_system into james-merge-erwin-most-recent
Merge pull request #18 from Babakadam121/james-merge-erwin-most-recent

James merge erwin most recent