rails new, mod README
rename .gitignore for resolving conflict.
resolve conflict.