Generated the Rails 3 application
resolved conflict in gitignore