Other stuff
Merge pull request #1 from 4thjuly/TempMerge

Stuff
Merge pull request #2 from 4thjuly/master

Stuff