Added functionality for accept and reject
Merge remote-tracking branch 'origin/master'