Modified .gitignore file
Merge branch 'master' of github.com:streetrader/omrails