Changed application layout
Pulled Ed's Changes to Playlist
Changed Database.yml
stuff
pulled ed's changes and added friend button
Friend Actions Working
Fixed delete method
merged Joes latest working friends model