commit .gitignore first
Empty rails project
merge with origin