A3 and update of lab3
Merge branch 'master' of https://github.com/JangoBoogaloo/Network