Including Dan's new tweets and city files.
Merge with resolved conflicts.
Merge pull request #3 from Murphydbuffalo/SinatraApp

Including Dan's new tweets and city files.