add waffle.io badge
Merge pull request #5 from waffle-iron/master

Add waffle.io Badge
Update fortune.rb
Resolve conflicts