settlement
Merge branch 'group3' of https://github.com/justinwm/SE-Payment into group3
settlement