merge
Merge branch 'master' of https://github.com/RainDogSoftware/pingpung
Merge remote-tracking branch 'origin/master'

Conflicts:
	pingpung.py
Merge branch 'master' of https://github.com/RainDogSoftware/pingpung