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

Conflicts:
	app/controllers/artists_controller.rb
	app/controllers/songs_controller.rb
dryed up the song views using a form partial
fixed one instance of the :_id not whitelisting issue
created artists and user forms
fixed last whitelisting
add session control
add error for bad login and remove session debug
Merge branch 'master' of github.com:h4w5/tunr
remove database.yml from git
strong params in userscontroller
naive implementation of password_digest
has_secure_password
slight refactor
setup for API call
song preview url / SWEET BEATS
rspec-rails and shoulda-matchers
first tests
song and user tests
purchases