By your powers combined ...
Merge branch 'master' of https://github.com/IgnoredTestDummy/fuckingteamwork

Pulling stuff.