added new way to run tests
Merge branch 'master' into short_methods
Refactored short_methods and got some more practice using rspec tests