First commit - draft proxy app
Merge branch 'master' of https://github.com/bschorr/thesis