modified fluff file
modified data.rb
Merge branches 'branch1' and 'branch2'