Addresses #30.
Merge branch 'master' of github.com:danavery/trailsyserver