My First Commit for the Ruby on Rails Demo
fixed conflict in .gitignore