Add if/else statement to base.html to show how reply was generated (proof of concept)
Merge remote-tracking branch 'origin/deployment' into deployment