merge in master
resolve merge conflict
merge master into branch
comment out a few key lines...
revise text to read signin OR signup
keep fiddling with twitter
add incomplete form...
merge master into branch
play with .data() function
add twitter user search form
display twitter user search results
add find_provider, create_twitter_client, new, and show methods
remove .coffee file
style twitter icons
add hidden form to collect subscription info
comment out submit button
Merge branch 'master' into kristen