test
Merge branch 'master' of github.com:riflemanIm/openvpn

Conflicts:
	inf.php
download from server