set up auth, no pw yet
resolve conflicts in routes.rb
fix routes
little auth action
configured routes some more. worked on views.
added add photo button to user show page
started jquery for add photo button
commended out submit button for non-existent form
resolve conflicts in routes
finished add_song portion of user show page. wrote ajax to hide form if over 4 uploads. fixed a few controller and route issues. got rid of turbolinks. rewrote items#create control for ajax.
added stylesheet and javascript link tags back into application.html.erb
auth works, no password yet
resolve merge conflicts
photo upload works