user can log in successfully
Merge branch 'master' of https://github.com/acreilly/tweet_of_hearts into user_login
Test first merge conflict
merged
fixed tweet link
Merge pull request #2 from acreilly/fixed_tweet_link

Fixed tweet link