Added time testing and improved peertime
Merge branch 'master' of github.com:markulrich/musicbeacon

Conflicts:
	src/peer-time.js
Better peertime
Merge branch 'master' of github.com:markulrich/musicbeacon