working on displaying replies
Merge branch 'master' into steven