Update temp.txt
Merge remote-tracking branch 'upstream/master'
Cleaned out temp file.
Merge pull request #23 from rhyolight/t1

cleanup