added categories model & database.yml
resolving conflicts