Update
Merge branch 'master' of https://github.com/George-/server.properties-Generator

Conflicts:
	src/server.properties