Add feature #2
Add description
Add rakefile
Merge branch 'second-branch' into test-branch