a little rspec
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
merge conflicts
Merge pull request #187 from Noahhh/master

A tiny bit of rspec and merging