Derp
Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff