Merge pull request #1 from 4thjuly/TempMerge

Stuff