just testing returning json
moving webserver down a directory
Merge branch 'master' of ssh://23.251.155.220:/~/hackthefed
minore updates