guest_spec
merge conflict resolved
more test coverage
Merge branch 'master' into shadi-test
MERGING
tests updated
Merge pull request #63 from fox-squirrels-2013/shadi-test

Shadi test