Set up Rails project
Update the README
Fix README conflict