a
b
Merge branch 'master' of https://github.com/SoftwareArchitecture/Peer

Conflicts:
	pom.xml
fingerprinting used in peer