preliminary dashboard.erb and dashboard.rb
dashboard.erb and dashboard.rb for review by group at after 4PM checkin
Changed password fields
Good index.rb
resolved conflict
resolved local merge conflicts