added categories
Merge branch 'master' of github.com:acannistra/trips