Merge pull request #15 from antonyliang/master

Merge
nothing
merge Merge branch 'master' of github.com:StanleyY/HackathonSpring13
removed txt file
Made a few minor changes