Add Registrations controller, set devise route, add username field to registration views and params
Merge pull request #4 from annemnichols/User-devise-model

Add Registrations controller, set devise route, add username field to re...
Set up Users controller for index and show pages
Merge pull request #5 from annemnichols/Users-controller

Set up Users controller for index and show pages
Add Users controller, basic formatting for index and show pages
Merge pull request #6 from annemnichols/Users-controller

Add Users controller, basic formatting for index and show pages
fixing merge conflicts