added keys folder to the a gitignore file.
merge conflict...

Merge branch 'master' of github.com:biblicabeebli/dvpn

Conflicts:
	easy-rsa/.rnd
	easy-rsa/keys/01.pem
	easy-rsa/keys/DVPN_server.crt
	easy-rsa/keys/DVPN_server.csr
	easy-rsa/keys/DVPN_server.key
	easy-rsa/keys/ca.crt
	easy-rsa/keys/ca.key
	easy-rsa/keys/client1.csr
	easy-rsa/keys/client1.key
	easy-rsa/keys/client2.csr
	easy-rsa/keys/client2.key
	easy-rsa/keys/client3.csr
	easy-rsa/keys/client3.key
	easy-rsa/keys/index.txt