Merge branch 'master' of https://github.com/YichiLL/RoRApp
Merge branch 'master' of https://github.com/YichiLL/RoRApp