Commenting now works
Merge pull request #203 from jivedesign/master

Commenting now works
testing the UI stuff and josh stuff merged