updated user_spec functional
updated merge conflicts
Merge pull request #38 from mdidier9/tests-md

Tests md