Added Rspec testing to program
Merge branch 'master' into comments