Fucking shit merge... also added some shit to FEelectronics fuck.
Merge branch 'master' of https://github.com/run1c/Master