Merge pull request #1 from Waffleologist/master

test
Merge pull request #2 from Waffleologist/master

temp
Merge pull request #3 from Waffleologist/master

rm temp
I added a comment lol
Merge pull request #3 from DrySniperKing/master

made a comment