comment edit
Merge branch 'master' of https://github.com/1nsidE/Join-iT