committing changes to schema.rb
updated schema conflicts, and fixed end on jamsmusicians migration