username setup
username merge conflict
add categories controller
added posts and users controllers/views
Merge remote-tracking branch 'origin/categories-controller' into controllers_and_views
added migrations and category view
added models and user attr_accessors
progress on category view
messed with category view on purpose
fix conflict
add gibberish for merge conflict practice
breaking line 1 of category view
removed index.html and messed with category view
fixed category view merge
no real changes
setup new user forms
RESTful categories
RESTful posts
added to user controller
setup all forms, create, edit users