Adds task shoulda gem and test
fixes schema merge conflict
Merge branch 'master' of github.com:leotumwattana/incognito