add twitter gem
add twitter secret
merge conflict with gemfile.lock
Merge pull request #3 from ricarora/twitter

Twitter