Adding ang changing lists
Merge branch 'multiple-lists'

Conflicts:
	app/views/users/show.html.erb