gitignore edits
update rails
Merge pull request #2 from apatel/master

updated rails