added a simple json api and etl program
Merge remote-tracking branch 'upstream/master'

This merge is ment to bring server api branch up-to-date with the main branch
added some more descriptive comments
Merge pull request #3 from amoderate/master

Added server api