Merge branch 'master' (@kortaggio's new readme and @nik_sg's database commit fix)
Merge branch 'master' of github.com:Queens-Hacks/tweetmatch