Add cucumber and rspec
Resolve merge conflictMerge branch 'master' of https://github.com/JoeShep/Universe