add hi.txt, christian
Merge remote-tracking branch 'upstream/dev' into dev
Make changes, add new routes and a default catchall route
rm ht.txt
Merge pull request #2 from CTownsdin/dev

Dev looks good!