stuff
Merge branch 'master' into jake
fixed the count on js and on controller and show page
shit