Finished first cut of the User model
User model with passwords, and user show page
Temp commit
Deleted user_controller.rb and custom.css files to get the merge done
Resolved issues in merging. Completion of Chp 7
User signup complete
Done with user edit/update, index, and destroy actions
updating-users-exercises
Added user microposts
Added user following