compiled shit
Merge branch 'master' of https://github.com/AhmedAA/BNDN

Conflicts:
	Client/ServiceTest/src/main.java
Merge branch 'master' of https://github.com/AhmedAA/BNDN

Conflicts:
	Client/ServiceTest/src/main.java
Merge branch 'master' of https://github.com/AhmedAA/BNDN

Conflicts:
	Client/ServiceTest/src/main.java