Work on echo_handler
Work on includes
Work on main server file
Echo works
Small, unimportant changes to main
Changes to fix merge conflict
Echo handler up and running