Never gonna tell a lie, and hurt you

I rearranged the Peer parameters so they would fit with the new
formatting.
NAHHHHHHHHHZEMBWAYYAAAAANABAICHIWABA

Moved Handshake outside of the Peer constructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Peer.class
	bin/Tracker.class
	src/Tracker.java