done
qweMerge branch 'master' of https://github.com/jQrgen/OSoving1x

Conflicts:
	log.txt