Resolving merge conflicts
Still resolving merge conflicts
Added edit.html.rb; fixed bugs and defaults