quick fix to edit controller
ziggeo fix
resolved pull conflicts
resolved coflicts
changed the edit.html.erb and partial in resovision