second commit
Merge branch 'master' of https://github.com/YixingCheng/OSP2_ResourceAllocation
I am coding