Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	LICENSE
	README.md
Merge branch 'master' of https://github.com/pvdheijden/mcrcon