Associating todo_lists with users
Merge branch 'associating-with-users'

Conflicts:
	config/initializers/devise.rb