Merge
Merge branch 'master' of https://github.com/AugustoLD/DataLinkLayerSimulator

Conflicts:
	TrabRedes-Cliente/build/classes/trabalho/de/redes/controleFluxo/RetransmissaoSeletiva.class
	TrabRedes-Cliente/build/classes/trabalho/de/redes/controleFluxo/StopAndWait.class
	TrabRedes-Cliente/src/trabalhoRedes/controleFluxo/RetransmissaoSeletiva.java
Merge branch 'master' of https://github.com/AugustoLD/DataLinkLayerSimulator

Conflicts:
	TrabRedes-Cliente/build/classes/trabalho/de/redes/controleFluxo/RetransmissaoSeletiva.class
	TrabRedes-Cliente/build/classes/trabalho/de/redes/controleFluxo/StopAndWait.class
	TrabRedes-Cliente/src/trabalhoRedes/controleFluxo/RetransmissaoSeletiva.java