add bcrypt
add associations for song and comment
schema minor update
fixed merge conflicts to include changes made for application.rb and schema