username setup
username merge conflict
add categories controller
Merge remote-tracking branch 'origin/categories-controller' into controllers_and_views
added migrations and category view