added metadata to peer.js handshake
added options to initiatePeerConenction method
added search by email optionto index.html;
reverted peerSetup configuration
Merge branch 'master' of https://github.com/bchu/nodetron into jseip1679
Merge branch 'master' of https://github.com/bchu/nodetron into brian

Conflicts:
	client/index.html