Added comission
conflict
conflict
Merge pull request #8 from SOSTheBlack/develop

Develop