committing changes
merged conflicts resolved
switching to resovisions_edit.html.erb branch to finish this feature
finished resovisions/edit view; changes to resovisions.js and small changes to educations controller