Changed twitter_id attribute to string
Formatted twitter search results
Merge branch 'master' of github.com:ashag/SeeMore

Conflicts:
	app/models/twitter_feed.rb
	db/schema.rb
Formatted twitter and tumblr search results
button is small
formatted tumblr feed
Twitter bar only shows up on index page
Alert and notice formatted
Merge branch 'css'

Conflicts:
	app/models/twitter_feed.rb
	app/views/welcome/index.html.erb
Merge branch 'master' of github.com:ashag/SeeMore into css

Conflicts:
	app/views/welcome/index.html.erb
Merge pull request #41 from ashag/css

Css