minor changes to test
Merge branch 'master' of github.com:bwinterling/fourthmeal
Added test coverage for Category.rb
Fixed gitignore
Fixed conflict with gitignore