Initial ruby project
Merge conflict