User model and controller
adding controller and views for login, logout, user
merge conflict in layouts
scaffolding for lists and tasks
changes to add a list
Merge pull request #3 from michaelghinrichs/paul_users

Paul users