Correct commit
Merge branch 'master' of https://github.com/BlackBossOrg/BlackBoss.git