.
Merge branch 'master' of github.com:nagelxz/manga-downloader

I made a change on the server to fix stupidity, I made significant changes to the code for the merge.
Merge branch 'master' of github.com:nagelxz/manga-downloader

I have no idea why i'm merging here
Merge branch 'master' of github.com:nagelxz/manga-downloader
because git ckeeps screwing with this file on pull