'initial commit'
Merge branch 'master' of https://github.com/RedZipper/net-prog
merged source