Fixed final issue with the rspec tests
Merge branch 'master' of github:AraneaValon/3308_Final_Project