explicit options hash
Merge branch 'master' of github.com:h4w5/tunr

Conflicts:
	app/controllers/artists_controller.rb
	app/controllers/songs_controller.rb
Merge branch 'master' of github.com:h4w5/tunr
remove database.yml from git