database updates
dropped dbase and deleted log to allow merge
start add comments to comments
update comment model
dropped dbase to merge
dropped dbase
Merge branch 'master' into comments
rebuild dbase with commentable model
comments have comments
cleanup for merge
fix merge conflicts
create topic method for comments to find their parent topic
updated scores controllers to refresh rather than return to index
commentable creation path working
get functional view for comment on comment
updated views for comments on comments
finsihed basic view edit
merge cleanup
resolved merge conflict
tested merge, looks OK