Add rspec to rails
Merge pull request #2 from mbacksmeier/update_gitignore

Update gitignore file
Merge pull request #1 from mbacksmeier/add_rspec

Add rspec to rails
fix merge conflict