Adding gitignore lines
Merge branch 'rails'