added jquery file upload plugin to asset pipleline
asset pipeline mod
fixed merge issues
nested attribute form
a lil jon magic
pay the cost to be the boss.t. wrote JS for iframe. modified controller. working on setting missing.png and now fixing up items#update. then make JS reload upon successful load of new picture.