2nd commit
Merge pull request #1 from ror-final-project/testbranch

2nd commit