change mafia to drup
Merge branch 'master' of https://github.com/Semicolon314/drup