fucked up the last one, trying again
Merge branch 'master' of https://github.com/wschneider/NetProgClient