Just some stuff that didn't get pushed for some reason
Merge pull request #1 from MineFormers/master

Just some stuff that didn't get pushed for some reason