deleted unnecessary crap
Merge branch 'master' of https://github.com/RedZipper/net-prog
merging to add local changes