edit.js to assets.rb. cooler looking
merg conflict