Fixed requirements for rSpec tests and gemfile conflicts
Merge branch 'master' of https://github.com/alexcodreanu86/tdd_telephone