updated twitter based on TA's input
fixed merge conflicts with master
merge
css and see more feature
added JavaScript to Tumblr search
fixed rss merge conflicts for css and js
Added css for all; added js to tumblr
Merge branch 'master' into rss