Added tweets for Nashville to the feeds page
Merge branch 'master' of https://github.com/sunderhaus/Citizen

Conflicts:
	app/templates/feed.html