saving posts work
feed shows user's 20 most recent homepage tweets
storing info while switching branches
feed pulls from twitter, adds tweets to posts and tweeters to feed, and posts things in chronological order
resolving merge conflict
resolved merge conflicts with master
finished feed display
remove partial and reconfigure index
changed format uid is passed to set posts
Merge pull request #38 from ashag/feed

Feed
Merge pull request #39 from ashag/rss

changed format uid is passed to set posts
Merge branch 'master' of github.com:ashag/SeeMore

Conflicts:
	app/models/twitter_feed.rb
	db/schema.rb
Merge branch 'css'

Conflicts:
	app/models/twitter_feed.rb
	app/views/welcome/index.html.erb