Merge pull request #22 from kamoh/ben_work

Updates TODO.md
add user model, controller, views
Merge pull request #23 from kamoh/add-user-resource

add user model, controller, views
make outfit and clothing article nested resources, fix views
Merge pull request #24 from kamoh/add-user-resource

make outfit and clothing article nested resources, fix views
Fixes merge conflict in nav