went around the horn with ajax to get this working
fixed merge conflict on app.js
Merge pull request #39 from bumblebees-2014/view

went around the horn with ajax to get this working