Merge pull request #1 from darcieryan/master

ok
'this is a test file added by zhaoru'
Merge pull request #2 from zhaoruzhang/master

Changed stuff
Merge branch 'master' of https://github.com/zhaoruzhang/Hobbit_Hole
Merge pull request #3 from zhaoruzhang/master

Get latest file
Added NEWEST_FILE.TXT.  An Awesome file.
Merge pull request #2 from hetland/master

Et cetera