Update config
Merge branch 'master' of github.com:nanonoxi/nis-practical

Conflicts:
	src/emailSecurity/client.java