paddles
Merge branch 'master' of https://github.com/eddiew/ping

Conflicts:
	ping.js