adding index.erb
pulling changes
fixed m conflict