whee
back to square one
fixed merge errors
changed form_tag to form_for
changed form_tag to form_for