test
Merge branch 'master' of https://github.com/alexandru-gheorghe/Proiect_IDP

Conflicts:
	src/Network/Network.java
asd
Merge branch 'master' of https://github.com/alexandru-gheorghe/Proiect_IDP