resolve merge conflict
going back to master
resolve merge conflict
Merge pull request #45 from toannguyenle/railapp

Railapp