Add edit project funtion
fix merge conflicts on show.html.erb