test for user complete using shoulda matchers
resolve merge conflict
Merge pull request #22 from hgw2101/resolve-merge-conflict

Resolve merge conflict