Change project title in README, fixes #6
Resolve conflicts
Merge pull request #8 from stevekinney/fix-readme

Change project title in README, fixes #6
Update affirmation.rb
Add random fortunes to /fortune [fixes #2]
Update affirmation.rb
Merge branch 'master' of github.com:stevekinney/feel-good-bot into add-fortunes
Merge branch 'add-fortunes' of github.com:stevekinney/feel-good-bot into add-fortunes