fixed merge conflicts and rspec failures
fixed merge conflicts
NOTHING
new test
Merge pull request #8 from dandydanny/jack_branch

Jack branch