Merge branch 'master' of https://github.com/Xyik/ece358

Conflicts:
ece358/networks/assignment2/DiscreteEventSimulator.class