Add friendly_id gem.
Add gemfile.lock and rvm configs to gitignore.
Fix relations.
Uncomment authentication filter.
Fix a typo.
Add friendly_id for artists.
Merge branch 'master' of github.com:ouyoutouchmytralala/bandyard

Conflicts:
	app/models/track.rb
Remove gemfile.lock because of gitignore.