rubocop cleaned up
twitter issue cleaned up
merge conflict
removes head marker
Merge pull request #49 from roseaboveit/twitter_feed

Twitter feed