fixing merge conflicts
Fix merge conflicts
committed for merge
merge conflicts
added coverage/index to gitignore
Really solving merge conflicts
Merge pull request #32 from roseaboveit/twitter_feed

Twitter feed
test changes
merge conflicts
improved layout, multisearch bar, and notices
Merge branch 'master' of github.com:roseaboveit/Gobblr into searchbar
constantized things
Merge pull request #33 from roseaboveit/searchbar

Searchbar
fixes search bar problem hopefully
initializer
merge conflicts and add tweet button to posts
Merge branch 'master' of github.com:roseaboveit/Gobblr into tweet_button
Merge pull request #35 from roseaboveit/tweet_button

Tweet button
whatver
coverage crap