Revert "Revert "Merge branch 'Add-tracks-model'""

This reverts commit 7a0147765637a4603e19a22ed8885769c038723f.

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