merge main.js
Merge branch 'develop' of https://github.com/AdFabConnect/FastWayToDie into develop