add rails starting files
fix merge conflicts