sets up some ajax in the controller and a js file
stopping to fix broken views
changes layout to the users show page w/ permissions
fixes my own merge conflicts
Merge branch 'master' of github.com:wfjeff/twinenyc