Fixed some shit
Merge branch 'master' of https://github.com/hsdxpro/Excessive-Team