Merge pull request #2 from 4thjuly/TempMerge

Stuff