Ready to go!
Merge branch 'master' of github.com:sburlot/phonecalls

Conflicts:
	server stuff/swisscom.pl