Solve rebase conflict
Merge pull request #14 from staunchRobots/categories-spec

Categories-spec