Merge branch 'master' of C:\Users\Nickolaj\PycharmProjects\skybot with conflicts.
fixed
fixed